From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 14 Apr 2020 08:58:38 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=650853fc895fb2e21eac347e056eab98b842a3b7;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users

# Conflicts:
#	lib/pleroma/notification.ex
---

650853fc895fb2e21eac347e056eab98b842a3b7
diff --cc lib/pleroma/notification.ex
index b76dd176c,3084bac3b..ca492c1ad
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@@ -5,8 -5,9 +5,10 @@@
  defmodule Pleroma.Notification do
    use Ecto.Schema
  
+   alias Ecto.Multi
    alias Pleroma.Activity
 +  alias Pleroma.FollowingRelationship
+   alias Pleroma.Marker
    alias Pleroma.Notification
    alias Pleroma.Object
    alias Pleroma.Pagination