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

Remove media proxy examples in config/config.exs

See merge request pleroma/pleroma!624
This commit is contained in:
kaniini 2019-01-03 22:29:36 +00:00
commit ccdc916f95
1 changed files with 1 additions and 7 deletions

View File

@ -186,13 +186,7 @@
reject: [], reject: [],
accept: [] accept: []
config :pleroma, :media_proxy, config :pleroma, :media_proxy, enabled: false
enabled: false,
# base_url: "https://cache.pleroma.social",
proxy_opts: [
# inline_content_types: [] | false | true,
# http: [:insecure]
]
config :pleroma, :chat, enabled: true config :pleroma, :chat, enabled: true