From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 14:53:56 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a8ca030d85368285af1b960e14dab5b847ecb35a;p=akkoma

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

a8ca030d85368285af1b960e14dab5b847ecb35a
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
index 50f3216f3,fda1c71df..f97ab510e
--- a/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