summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-05-26 08:24:50 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-05-26 08:30:41 +0000
commit1c926c7b60b999311d01266bb65187e1be5adc1e (patch)
tree7b8ed19a65cc2250a7f88ff36e7ee533e5c4907e /config
parent5d6d86bf00fa533d505ffe5fc3df6c3eadae5739 (diff)
downloadpleroma-1c926c7b60b999311d01266bb65187e1be5adc1e.tar.gz
pleroma-1c926c7b60b999311d01266bb65187e1be5adc1e.zip
activitypub: allow mastodon S2S block extension support to be disabled
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
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: [],