From: lain <lain@soykaf.club>
Date: Mon, 4 May 2020 08:43:20 +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=c40afe5ba040964834657ef18f92bf9f1a1770d1;p=akkoma

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

c40afe5ba040964834657ef18f92bf9f1a1770d1
diff --cc lib/pleroma/web/common_api/common_api.ex
index 359045f48,f9db97d24..1eda0b2f2
--- a/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