pleroma

commit: ccdc916f95d770f43d98cde3ca3d8454c6342a33
parent: eaaf701319cc3faf49ddcee359c796ec682886d8
Author: kaniini <nenolod@gmail.com>
Date:   Thu,  3 Jan 2019 22:29:36 +0000

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

Remove media proxy examples in config/config.exs

See merge request pleroma/pleroma!624
Diffstat:
M
config/config.exs
8
+-------

1 file changed, 1 insertion(+), 7 deletions(-)
diff --git 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