Merge branch 'feld-develop-patch-26755' into 'develop'

Update CHANGELOG.md See merge request pleroma/pleroma!3351
2021-02-28 19:01:01 +00:00 · 2021-02-28 19:01:01 +00:00 · 9fb8da4293
commit 9fb8da4293
parent e8d88a72cf 8a563efdd8
1 changed files with 0 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -44,7 +44,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added

 - Reports now generate notifications for admins and mods.
- Experimental websocket-based federation between Pleroma instances.
 - Support for local-only statuses.
 - Support pagination of blocks and mutes.
 - Account backup.