Revert "Merge branch 'revert-4fabf83a' into 'develop'"

This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
This commit is contained in:
Egor Kislitsyn 2019-09-16 17:03:37 +07:00
commit 96816ceaa2
26 changed files with 888 additions and 447 deletions

View file

@ -331,6 +331,10 @@ config :pleroma, :activitypub,
follow_handshake_timeout: 500,
sign_object_fetches: true
config :pleroma, :streamer,
workers: 3,
overflow_workers: 2
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default