Merge branch 'develop' into 'editProfile'

# Conflicts: # CHANGELOG.md
2021-06-17 19:35:09 +00:00 · 2021-06-17 19:35:09 +00:00 · b2ebfc1fd6
commit b2ebfc1fd6
parent e1361a1cae 338134acfb
7 changed files with 13 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added option to mark posts as sensitive by default
 - 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