Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

diff --cc lib/pleroma/notification.ex
Simple merge

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

diff --cc lib/pleroma/web/common_api/common_api.ex
index 359045f4881b80180a960915abfb224d45563de3,f9db97d24711b66449fed05b10f489459bc83926..1eda0b2f2ea0a515cfe92afd72822f0a9c0e9e66
--- 1/lib/pleroma/web/common_api/common_api.ex
--- 2/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@@ -7,7 -7,7 +7,8 @@@ defmodule Pleroma.Web.CommonAPI d
    alias Pleroma.ActivityExpiration
    alias Pleroma.Conversation.Participation
    alias Pleroma.FollowingRelationship
 +  alias Pleroma.Formatter
+   alias Pleroma.Notification
    alias Pleroma.Object
    alias Pleroma.ThreadMute
    alias Pleroma.User

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

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

diff --cc test/web/common_api/common_api_test.exs
Simple merge