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

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

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
index 50f3216f36de8abc32a23d644350a42cd6d7018b,fda1c71df1e13244e329466903db3fb506b22781..f97ab510e65001ad82bf42d4a6255077d2bed08b
--- 1/lib/pleroma/web/activity_pub/transmogrifier.ex
--- 2/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@@ -9,7 -9,7 +9,8 @@@ defmodule Pleroma.Web.ActivityPub.Trans
    alias Pleroma.Activity
    alias Pleroma.EarmarkRenderer
    alias Pleroma.FollowingRelationship
 +  alias Pleroma.Notification
+   alias Pleroma.Maps
    alias Pleroma.Object
    alias Pleroma.Object.Containment
    alias Pleroma.Repo

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