diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:10 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:49 +0100 |
| commit | ac72b578da673282b927b945bfe03cd3012444b6 (patch) | |
| tree | 45b8c075aa883ca47fd24f3e71f6740bd2f2308b /config | |
| parent | c01ef574c192488c2643a20b4064439757613449 (diff) | |
| parent | 48552b38b2dd26bb832e940a0e52c0e1c2165b31 (diff) | |
| download | pleroma-ac72b578da673282b927b945bfe03cd3012444b6.tar.gz pleroma-ac72b578da673282b927b945bfe03cd3012444b6.zip | |
Merge branch 'develop' into feature/thread-muting
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index c272ef34a..5db0ea9aa 100644 --- a/config/config.exs +++ b/config/config.exs @@ -238,6 +238,11 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :mrf_keyword, + reject: [], + federated_timeline_removal: [], + replace: [] + config :pleroma, :rich_media, enabled: true config :pleroma, :media_proxy, |