Merge branch 'feature/locked-accounts-part-1' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d3f9cf6e497d6aae0a31112cf8028c0ab1958275..3292bf29c6d83b1ef3c57969ee2bbdc48b8332b8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -54,7 +54,10 @@ config :pleroma, :instance,
   registrations_open: true,
   federating: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
-  public: true
+  public: true,
+  quarantined_instances: []
+
+config :pleroma, :activitypub, accept_blocks: true
 
 config :pleroma, :mrf_simple,
   media_removal: [],