Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...

# Conflicts:
#	lib/pleroma/notification.ex

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/notification.ex
index b76dd176c0be6c5b9bfe9121f6f79ce694d67b7b,3084bac3b47f2ac420b85bd8a0cd6bd89fbb6f04..ca492c1addb1158fcb054aecba50bdf0dea126bd
--- 1/lib/pleroma/notification.ex
--- 2/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

diff --cc test/notification_test.exs
Simple merge