projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
eaaf701
)
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
author
kaniini
<nenolod@gmail.com>
Thu, 3 Jan 2019 22:29:36 +0000
(22:29 +0000)
committer
kaniini
<nenolod@gmail.com>
Thu, 3 Jan 2019 22:29:36 +0000
(22:29 +0000)
Remove media proxy examples in config/config.exs
See merge request pleroma/pleroma!624
config/config.exs
patch
|
blob
|
history
diff --git
a/config/config.exs
b/config/config.exs
index 34b516e02f983eedacf96bb6caf9a11948b966ad..601d9e22765c2d71d963879a7b06889d138e6c90 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-186,13
+186,7
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
-config :pleroma, :media_proxy,
- enabled: false,
- # base_url: "https://cache.pleroma.social",
- proxy_opts: [
- # inline_content_types: [] | false | true,
- # http: [:insecure]
- ]
+config :pleroma, :media_proxy, enabled: false
config :pleroma, :chat, enabled: true