Merge branch 'develop' into '2435-list-multiple-users'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index a14e03b68cc27f00665e7dce67e8a18e6be12b72,9ea242e11ee8279f6fdcabaafc07e26c5c0dc6ae..a6459ac97f80dcb2c0687cf915325cd8b09e0f2a
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -53,7 -63,7 +63,8 @@@ The format is based on [Keep a Changelo
    <summary>API Changes</summary>
    - Mastodon API: Current user is now included in conversation if it's the only participant.
    - Mastodon API: Fixed last_status.account being not filled with account data.
 +  - Mastodon API: Fix not being able to add or remove multiple users at once in lists.
+   - Mastodon API: Fixed own_votes being not returned with poll data.
  </details>
  
  ## Unreleased (Patch)