From: lain <lain@soykaf.club>
Date: Tue, 26 Jan 2021 14:24:32 +0000 (+0000)
Subject: Merge branch 'develop' into '2435-list-multiple-users'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=229acae6c3da541ebb0438cb7f310cdce1df92b3;p=akkoma

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

# Conflicts:
#   CHANGELOG.md
---

229acae6c3da541ebb0438cb7f310cdce1df92b3
diff --cc CHANGELOG.md
index a14e03b68,9ea242e11..a6459ac97
--- a/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)