Fix merge conflict in CHANGELOG

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
eris 2021-07-22 20:47:36 +00:00
commit f35e3d0f3f
12 changed files with 73 additions and 24 deletions

View file

@ -10,8 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added quick filters for notifications
- Implemented user option to change sidebar position to the right side
- Implemented user option to hide floating shout panel
- Implemented "edit profile" button if viewing own profile which opens profile settings
- Added Apply and Reset buttons to the bottom of theme tab to minimize UI travel
### Fixed
- Fixed follow request count showing in the wrong location in mobile view
## [2.3.0] - 2021-03-01
### Fixed