From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 21 Apr 2020 05:20:50 +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=bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1
diff --cc CHANGELOG.md
index 080d44063,2d8e7efc3..323ebdbe5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -20,7 -24,7 +24,8 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Support pagination in conversations API
+ - **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again
 +- Filtering of push notifications on activities from blocked domains
  
  ## [unreleased-patch]
  ### Fixed