summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-16 09:09:21 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-16 09:09:21 +0000
commitc623b4324deaf236334a0f77a81435b5bffadf3c (patch)
tree3e4ed9af085e410ebab1adbb6ecc1d9cd84f3e42 /config/config.exs
parent4fabf83ad01352442906d79187aeab4c777f4df8 (diff)
downloadpleroma-c623b4324deaf236334a0f77a81435b5bffadf3c.tar.gz
pleroma-c623b4324deaf236334a0f77a81435b5bffadf3c.zip
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index b1b98af93..ab6e00c98 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -331,10 +331,6 @@ 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