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

# Conflicts: # CHANGELOG.md
2020-04-22 20:00:51 +03:00 · 2020-04-22 20:00:51 +03:00 · e7fb593d13
commit e7fb593d13
parent b03aeae8b9 28f8fcf8b0
33 changed files with 349 additions and 106 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### 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]