diff options
| author | squidboi <squidboi@waifu.club> | 2018-06-16 15:37:16 -0700 |
|---|---|---|
| committer | squidboi <squidboi@waifu.club> | 2018-06-16 15:37:16 -0700 |
| commit | 2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb (patch) | |
| tree | 740d660abc0ca455368144abc89c8a398e85caf0 /config | |
| parent | 4f9ecfc77a54eef23741c89206b4cbce924f7d76 (diff) | |
| parent | 1ea4a18ad859600841860cdd1a981da868aa18a0 (diff) | |
| download | pleroma-2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb.tar.gz pleroma-2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb.zip | |
Merge branch 'develop' into feature/configurable-blocks
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index b8dd867c4..e1a77d3e1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -64,6 +64,10 @@ config :pleroma, :activitypub, config :pleroma, :user, deny_follow_blocked: true +config :pleroma, :mrf_rejectnonpublic, + allow_followersonly: false, + allow_direct: false + config :pleroma, :mrf_simple, media_removal: [], media_nsfw: [], |