pleroma

commit: b7b05a074867c1444dd539d6d2331f6d5504f6e6
parent cc09079aea54f5ff754925e0d5fbbc3b268dcb6d
Author: Alex Gleason <alex@alexgleason.me>
Date:   Wed,  6 Jan 2021 15:42:36 -0600

Oopsie whoopsie fix changelog

Diffstat:
M
CHANGELOG.md
6
------

1 file changed, 0 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -141,13 +141,7 @@ switched to a new configuration mechanism, however it was not officially removed
 - Allow sending out emails again.
 - Allow sending chat messages to yourself
 - OStatus / static FE endpoints: fixed inaccessibility for anonymous users on non-federating instances, switched to handling per `:restrict_unauthenticated` setting.
-<<<<<<< HEAD
-- Mastodon API: Current user is now included in conversation if it's the only participant
-- Mastodon API: Fixed last_status.account being not filled with account data
-- See your own post when addressing a user from a blocked domain.
-=======
 - Fix remote users with a whitespace name.
->>>>>>> upstream/develop
 
 ### Upgrade notes