Merge remote-tracking branch 'MAIN/develop' into feature/jobs

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/application.ex
index 60cba1580ebf7a9f7af088a4a4847d8544e1b591,40bff08c722dbccdbd0fac96c76f608ec8311cbe..e81816e350b846fea91e1fbf5afbbb000b187c1f
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -99,13 -101,15 +101,16 @@@ defmodule Pleroma.Application d
            ],
            id: :cachex_idem
          ),
-         worker(Pleroma.FlakeId, []),
-         worker(Pleroma.Web.Federator.RetryQueue, []),
-         worker(Pleroma.Stats, []),
-         worker(Pleroma.Web.Push, []),
-         worker(Pleroma.Jobs, []),
-         worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
+         worker(Pleroma.FlakeId, [])
        ] ++
 -          worker(Pleroma.Web.Federator, []),
+         hackney_pool_children() ++
+         [
+           worker(Pleroma.Web.Federator.RetryQueue, []),
 -          worker(Pleroma.Web.Push, [])
+           worker(Pleroma.Stats, []),
++          worker(Pleroma.Web.Push, []),
++          worker(Pleroma.Jobs, []),
++          worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)          
+         ] ++
          streamer_child() ++
          chat_child() ++
          [

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc lib/pleroma/web/ostatus/ostatus_controller.ex
Simple merge