diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-03 22:29:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-03 22:29:36 +0000 |
| commit | ccdc916f95d770f43d98cde3ca3d8454c6342a33 (patch) | |
| tree | b41e1d1cff95b529855773eecbd3ac269843bb1e | |
| parent | eaaf701319cc3faf49ddcee359c796ec682886d8 (diff) | |
| parent | 53f56039e5486e429f3f0675936fc0f28225c272 (diff) | |
| download | pleroma-ccdc916f95d770f43d98cde3ca3d8454c6342a33.tar.gz | |
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
Remove media proxy examples in config/config.exs
See merge request pleroma/pleroma!624
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 34b516e02..601d9e227 100644 --- 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 |