Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 5ea4cb899599286c159611469544c737051bc0a4..9dc9387c82593174f25403b19aefd259984b1c53 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -102,7 +102,7 @@ config :pleroma, :emoji,
     # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
     Custom: ["/emoji/*.png", "/emoji/**/*.png"]
   ],
-  default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
+  default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
 
 config :pleroma, :uri_schemes,
   valid_schemes: [
@@ -413,7 +413,8 @@ config :pleroma_job_queue, :queues,
   web_push: 50,
   mailer: 10,
   transmogrifier: 20,
-  scheduled_activities: 10
+  scheduled_activities: 10,
+  user: 10
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,