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

# Conflicts:
#	lib/pleroma/notification.ex

diff --cc CHANGELOG.md
index 2afe2651011465adc4c8650c0598f13fe5af14fd,56b235f6dccc1878b101087b61120b63d946aba9..080d440638c74f712c69a90739d08ab94d24287a
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -20,9 -20,10 +20,11 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Support pagination in conversations API
 +- Filtering of push notifications on activities from blocked domains
  
  ## [unreleased-patch]
+ ### Fixed
+ - Logger configuration through AdminFE
  
  ## [2.0.2] - 2020-04-08
  ### Added

diff --cc lib/pleroma/notification.ex
index ca492c1addb1158fcb054aecba50bdf0dea126bd,04ee510b9f13fa7d346064988dacaea2d95babc1..f517282f7c030928513e3ce87c1bd5af59b23938
--- 1/lib/pleroma/notification.ex
--- 2/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@@ -5,10 -5,7 +5,9 @@@
  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