pleroma

commit: 9fb8da429360ddb9433f4c740126e2d858b1f141
parent e8d88a72cf6633444f9056807f6e048c66cf952d
Author: feld <feld@feld.me>
Date:   Sun, 28 Feb 2021 19:01:01 +0000

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

Update CHANGELOG.md

See merge request pleroma/pleroma!3351
Diffstat:
M
CHANGELOG.md
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git 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.