Commit ccdc916f authored by kaniini's avatar kaniini
Browse files

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

Remove media proxy examples in config/config.exs

See merge request !624
parents eaaf7013 53f56039
Pipeline #5958 passed with stages
in 3 minutes and 8 seconds
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment