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

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 323ebdbe5faa1244ec7e38222e2c44d5b49f3093,702c581806e70f01be7df7da402961311c34fe37..27746726eb6bfde1c3ab553090e73be7aff7c366
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -25,7 -25,7 +25,8 @@@ The format is based on [Keep a Changelo
  ### Fixed
  - Support pagination in conversations API
  - **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again
+ - Fix follower/blocks import when nicknames starts with @
 +- Filtering of push notifications on activities from blocked domains
  
  ## [unreleased-patch]
  ### Fixed