Fix changelog merge conflict

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
eris 2021-07-22 20:46:41 +00:00
commit 179af131ee
10 changed files with 69 additions and 21 deletions

View file

@ -10,6 +10,7 @@ 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
- Implemented user option to always show floating New Post button (normally mobile-only)
### Fixed