Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

# Conflicts:
#   config/config.exs
#   docs/config.md

diff --cc config/config.exs
index d68edafcb9f9523d14849c64dde59d15c758e2fd,8a977ece5d5089a60ff33b8c2956dea3555a0e03..779d128863d8e1de7668f373f625b8b3e37c640d
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -352,7 -362,7 +362,8 @@@ config :pleroma_job_queue, :queues
    federator_incoming: 50,
    federator_outgoing: 50,
    mailer: 10,
-   transmogrifier: 20
++  transmogrifier: 20,
+   scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,

diff --cc docs/config.md
index dd3cc37276475177cb944c94b48fb99c13cb618c,ba0759e87c8468a1e3aaf3092bfc5f285b32be36..22d2a3e7c5eebdffdf5af4b72d06bbc4d7dc3a06
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -300,7 -317,7 +318,8 @@@ 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: