Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'

# Conflicts: # CHANGELOG.md
2020-07-02 04:50:03 +00:00 · 2020-07-02 04:50:03 +00:00 · c0fb35b106
commit c0fb35b106
parent 0ca3a6e63d beb160bd53
9 changed files with 32 additions and 42 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -43,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Clicking on non-image/video files no longer opens an empty modal
 - Audio files can now be played back in the frontend with hidden attachments
 - Videos are not cropped awkwardly in the uploads section anymore
+- Reply filtering options in Settings -> Filtering now work again using filtering on server

 ## [2.0.3] - 2020-05-02
 ### Fixed