diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-31 16:22:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-31 16:22:26 +0000 |
| commit | fb9730010e794a7f80c94b4320fd0591f2e7c93c (patch) | |
| tree | 90a2a6499cddfed17d203d6af11b46a3b9dad36a /config | |
| parent | bd89cdbe318ce12e0273163a51f2907e6e763be6 (diff) | |
| parent | 7057891db649e1a72abfda13418d8c4bddd4ec92 (diff) | |
| download | pleroma-fb9730010e794a7f80c94b4320fd0591f2e7c93c.tar.gz | |
Merge branch 'fix/rich-media-disable-in-config' into 'develop'
Make rich media support toggleable
See merge request pleroma/pleroma!748
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 4dc7a62d7..98c94c149 100644 --- a/config/config.exs +++ b/config/config.exs @@ -235,6 +235,8 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :rich_media, enabled: true + config :pleroma, :media_proxy, enabled: false, proxy_opts: [ |