diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-07 16:29:33 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-07 16:29:33 +0000 |
| commit | 839cb7b42404f86bdfcf043c5e8dbce08dd3928c (patch) | |
| tree | 0917a5ac87708258d546397eb26bee5876a2eee6 /config | |
| parent | b4292295d7fe629c6a29f221cab1deae1ec3008c (diff) | |
| parent | 595ca3bb3a80eb3908a96b13c8b446296219a9c7 (diff) | |
| download | pleroma-839cb7b42404f86bdfcf043c5e8dbce08dd3928c.tar.gz pleroma-839cb7b42404f86bdfcf043c5e8dbce08dd3928c.zip | |
Merge branch 'develop' into 'mastopost'
# Conflicts:
# .gitignore
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 826dd07b7..3292bf29c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -54,7 +54,8 @@ 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 |