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

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 080d440638c74f712c69a90739d08ab94d24287a,2d8e7efc3f921d47b5584c3e6d90377123fa576e..323ebdbe5faa1244ec7e38222e2c44d5b49f3093
--- 1/CHANGELOG.md
--- 2/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

diff --cc lib/pleroma/notification.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge