From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 22 Apr 2020 17:00:51 +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=e7fb593d130e0ad62e3690dce4a0913fe3d40ef0;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

e7fb593d130e0ad62e3690dce4a0913fe3d40ef0
diff --cc CHANGELOG.md
index 323ebdbe5,702c58180..27746726e
--- a/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