aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2021-02-27 18:23:11 +0000
committerShpuld Shpludson <shp@cock.li>2021-02-27 18:23:11 +0000
commit92a9ce67c595bf54a95cca917ba07772bec0f041 (patch)
treebad1001ffb34de3c4d3ee6684768f977b691cb8a /CHANGELOG.md
parent485f4b899ccad57694b7a45535936b7a5de8c4fb (diff)
Update CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a599ddb..a294c106 100644
--- 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