Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

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

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

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

diff --cc lib/pleroma/web/federator/federator.ex
index 37100c9e6277f0fdabb7dced65ea42df0dff9ce1,468959a65f34883b55d07593d149b043374195eb..7df75aca602264b13a49e6d88705b96d8575dc9b
--- 1/lib/pleroma/web/federator/federator.ex
--- 2/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@@ -3,16 -3,20 +3,19 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.Federator do
-   alias Pleroma.User
 -  use GenServer
 -
    alias Pleroma.Activity
-   alias Pleroma.Jobs
-   alias Pleroma.Web.{WebFinger, Websub, Salmon}
-   alias Pleroma.Web.Federator.RetryQueue
+   alias Pleroma.User
+   alias Pleroma.Web.WebFinger
+   alias Pleroma.Web.Websub
+   alias Pleroma.Web.Salmon
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Relay
    alias Pleroma.Web.ActivityPub.Transmogrifier
    alias Pleroma.Web.ActivityPub.Utils
+   alias Pleroma.Web.Federator.RetryQueue
    alias Pleroma.Web.OStatus
++  alias Pleroma.Jobs
+ 
    require Logger
  
    @websub Application.get_env(:pleroma, :websub)

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

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

diff --cc lib/pleroma/web/websub/websub.ex
index 82845f13dbf100b293e0f97e65a96671dac43886,a08d7993d007915d63a00265ab4389ab2e825a37..c00ec08582aa328598d14fa02019d14833ecea1f
--- 1/lib/pleroma/web/websub/websub.ex
--- 2/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@@ -4,12 -4,15 +4,16 @@@
  
  defmodule Pleroma.Web.Websub do
    alias Ecto.Changeset
-   alias Pleroma.Repo
    alias Pleroma.Instances
-   alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
+   alias Pleroma.Repo
+   alias Pleroma.Web.Websub.WebsubServerSubscription
+   alias Pleroma.Web.Websub.WebsubClientSubscription
    alias Pleroma.Web.OStatus.FeedRepresenter
-   alias Pleroma.Web.{XML, Endpoint, OStatus, Federator}
+   alias Pleroma.Web.XML
+   alias Pleroma.Web.Endpoint
+   alias Pleroma.Web.OStatus
    alias Pleroma.Web.Router.Helpers
++  alias Pleroma.Web.Federator
    require Logger
  
    import Ecto.Query

diff --cc lib/pleroma/web/websub/websub_controller.ex
Simple merge