Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'

Remove media proxy examples in config/config.exs See merge request pleroma/pleroma!624
2019-01-03 22:29:36 +00:00 · 2019-01-03 22:29:36 +00:00 · ccdc916f95
parent eaaf701319 53f56039e5
commit ccdc916f95
1 changed files with 1 additions and 7 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -186,13 +186,7 @@
  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