diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-04-25 00:46:28 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-04-25 00:46:28 -0400 |
| commit | 9e0dd21ed637ec7b884570b2ad8705b5fac72580 (patch) | |
| tree | 6efae2883556ee499dcefb0083412701b501f3e8 /config | |
| parent | 0df1a4efc841af4a12f45c1551f372d867ff7e1d (diff) | |
| parent | d4a54a90c9ae39947c71876d4d2988a05a02d7a1 (diff) | |
| download | pleroma-9e0dd21ed637ec7b884570b2ad8705b5fac72580.tar.gz pleroma-9e0dd21ed637ec7b884570b2ad8705b5fac72580.zip | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
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, |