Merge branch 'develop' into 'fix/autocomplete-fixes'

# Conflicts: # CHANGELOG.md
2020-08-31 13:58:02 +00:00 · 2020-08-31 13:58:02 +00:00 · 5b7decea3d
commit 5b7decea3d
parent 4da248f8bc acc45b49a5
2 changed files with 9 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ## [Unreleased]
 ## [Unreleased patch]
+
+### Changed
+- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
+
 ### Fixed
 - Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over.
 - Fixed weird autocomplete behavior when you write ":custom_emoji: ?"