diff options
| author | Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> | 2018-04-28 11:59:01 +0100 |
|---|---|---|
| committer | Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> | 2018-04-28 11:59:01 +0100 |
| commit | 634c0c52a1281e1576d028c74ee77fd05abe09de (patch) | |
| tree | 7d7ceed6f22bd26a7e290b875b0cef7519342a71 /config | |
| parent | 7517155544f85f0bd085c0ef0dd843fdac1fc4fd (diff) | |
| parent | 39c80a3667afec25a187894d67e0d0e9b8713eb1 (diff) | |
| download | pleroma-634c0c52a1281e1576d028c74ee77fd05abe09de.tar.gz pleroma-634c0c52a1281e1576d028c74ee77fd05abe09de.zip | |
Merge remote-tracking branch 'upstream/develop' into patch-bio
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 68c054457..d3f9cf6e4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,7 +52,15 @@ config :pleroma, :instance, limit: 5000, upload_limit: 16_000_000, registrations_open: true, - federating: true + federating: true, + rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, + public: true + +config :pleroma, :mrf_simple, + media_removal: [], + media_nsfw: [], + federated_timeline_removal: [], + reject: [] config :pleroma, :media_proxy, enabled: false, |