diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-26 09:50:54 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-26 09:50:54 +0000 |
| commit | e1fe46e1cfccb7971032ecfa04426413f0c00ac6 (patch) | |
| tree | 7b8ed19a65cc2250a7f88ff36e7ee533e5c4907e /config | |
| parent | 5d6d86bf00fa533d505ffe5fc3df6c3eadae5739 (diff) | |
| parent | 1c926c7b60b999311d01266bb65187e1be5adc1e (diff) | |
| download | pleroma-e1fe46e1cfccb7971032ecfa04426413f0c00ac6.tar.gz pleroma-e1fe46e1cfccb7971032ecfa04426413f0c00ac6.zip | |
Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
activitypub: allow mastodon S2S block extension support to be disabled
See merge request pleroma/pleroma!176
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index d3f9cf6e4..826dd07b7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -56,6 +56,8 @@ config :pleroma, :instance, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true +config :pleroma, :activitypub, accept_blocks: true + config :pleroma, :mrf_simple, media_removal: [], media_nsfw: [], |