diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-25 23:23:27 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-25 23:23:27 +0000 |
| commit | 5b2791698c7e09da6a5481f7c024ea8622e9a3c1 (patch) | |
| tree | a2b5c9a0c322ee68c363ce6c8b78c64525a0987b /config | |
| parent | 8c9227c1f1fa9c98069b549976be5b9c4ace076e (diff) | |
| parent | 24c3e2db2c6846073df80c124633dc851c20c107 (diff) | |
| download | pleroma-5b2791698c7e09da6a5481f7c024ea8622e9a3c1.tar.gz pleroma-5b2791698c7e09da6a5481f7c024ea8622e9a3c1.zip | |
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
Add mediaproxy whitelist capability
Closes #837
See merge request pleroma/pleroma!1095
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index b11e4c680..a1cca06f8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -326,7 +326,8 @@ config :pleroma, :media_proxy, follow_redirect: true, pool: :media ] - ] + ], + whitelist: [] config :pleroma, :chat, enabled: true |