diff options
| author | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
| commit | 4b3ec5351466f8615b32e62cc4e6215f8a80b105 (patch) | |
| tree | e46842eac5d8255858a113f71bdf42bfd75e4436 /config/config.exs | |
| parent | 4fd9df100f61dfe4731934eca86500472d866f60 (diff) | |
| parent | 6138b297836f459e4fe5d21dfed30ddd9397b6d4 (diff) | |
| download | pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.tar.gz pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.zip | |
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
Diffstat (limited to 'config/config.exs')
| -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: [], |