diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-22 15:46:04 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-22 15:46:04 +0000 |
| commit | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (patch) | |
| tree | 675d12898dda386f8290743f7eaedfb3dcbcdd51 /CHANGELOG.md | |
| parent | 468cc977be3d4a00760861efb34aa931c84defbb (diff) | |
| parent | 771c1ad735eb06842278e823a29acb94fd9acafb (diff) | |
| download | pleroma-28f8fcf8b034223209ec451d0c2c836124ec93f4.tar.gz pleroma-28f8fcf8b034223209ec451d0c2c836124ec93f4.zip | |
Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d8e7efc3..702c58180 100644 --- 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 @ ## [unreleased-patch] ### Fixed |