fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
parent eaaf701319 53f56039e5
commit ccdc916f95
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/config.exs
View file

@ -186,13 +186,7 @@ config :pleroma, :mrf_simple,
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