From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 14 Apr 2020 17:10:02 +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=0cda80f266c03557b47112e52bfe748655b4321c;p=akkoma

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

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

0cda80f266c03557b47112e52bfe748655b4321c
diff --cc CHANGELOG.md
index 2afe26510,56b235f6d..080d44063
--- a/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 ca492c1ad,04ee510b9..f517282f7
--- a/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