diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-09 11:38:37 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-09 11:38:37 +0000 |
| commit | 1eecbc1cd1a7f632e536f943fab6612e1e108d59 (patch) | |
| tree | af3d60fbbf416f7466ba9e8c17d0cba0c1b73904 /config | |
| parent | c5f8df08a724763398e2962a2ef378a4f00067a3 (diff) | |
| parent | b05a3411871fbfb8d1a5525d6875a635917abffa (diff) | |
| download | pleroma-1eecbc1cd1a7f632e536f943fab6612e1e108d59.tar.gz pleroma-1eecbc1cd1a7f632e536f943fab6612e1e108d59.zip | |
Merge branch 'feature/keyword-policy' into 'develop'
Add keyword policy
See merge request pleroma/pleroma!794
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, |