aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-08 11:42:20 +0000
committerlambda <lain@soykaf.club>2019-04-08 11:42:20 +0000
commite19590c93f9adc5d743867b048aad9528810fc53 (patch)
tree7e3c4e5849a2b5303149b582d788cc108e0b9d69 /docs
parentfd45cab9eccecc835dde457d72ba38bd31c8f7f6 (diff)
parentb4da2bc1d009ecca0d7821abe3577d1a920c41c0 (diff)
downloadpleroma-e19590c93f9adc5d743867b048aad9528810fc53.tar.gz
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019
Diffstat (limited to 'docs')
-rw-r--r--docs/config.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index ed9b91363..7e7fa754a 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -314,9 +314,11 @@ curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerando
[Pleroma Job Queue](https://git.pleroma.social/pleroma/pleroma_job_queue) configuration: a list of queues with maximum concurrent jobs.
Pleroma has the following queues:
+
* `federator_outgoing` - Outgoing federation
* `federator_incoming` - Incoming federation
* `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer)
+* `transmogrifier` - Transmogrifier
* `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity)
Example: