diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-04-24 17:21:28 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-04-24 17:21:28 +0000 |
commit | 7a52c4549c5936e691357d0ba77e5e54bd94e928 (patch) | |
tree | fa2b04e3635a7c8075c106343b91e0566423d050 /config | |
parent | bbd549c018879b3504633f1d87dce49d955d6d0c (diff) | |
parent | f08f9d449811d7a67b5c901889b0fef2e9ab8da9 (diff) | |
download | pleroma-7a52c4549c5936e691357d0ba77e5e54bd94e928.tar.gz pleroma-7a52c4549c5936e691357d0ba77e5e54bd94e928.zip |
Merge branch 'feature/message-rewrite-facility' into 'develop'
message rewrite facility
See merge request pleroma/pleroma!112
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 68c054457..b0f4578d5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,7 +52,14 @@ config :pleroma, :instance, limit: 5000, upload_limit: 16_000_000, registrations_open: true, - federating: true + federating: true, + rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy + +config :pleroma, :mrf_simple, + media_removal: [], + media_nsfw: [], + federated_timeline_removal: [], + reject: [] config :pleroma, :media_proxy, enabled: false, |