Merge branch 'fix/html-cache-content-collision' into 'develop'

[akkoma] / config / config.exs

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