pleroma-fe

commit: 92a9ce67c595bf54a95cca917ba07772bec0f041
parent 485f4b899ccad57694b7a45535936b7a5de8c4fb
Author: Shpuld Shpludson <shp@cock.li>
Date:   Sat, 27 Feb 2021 18:23:11 +0000

Update CHANGELOG.md
Diffstat:
M
CHANGELOG.md
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
->>>>>>> develop
 
 ## [2.2.3] - 2021-01-18
 ### Added