From: feld <feld@feld.me>
Date: Wed, 3 Feb 2021 14:23:23 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/2412-filters'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=008499f65a33f5d42a98cc3719f6ab5e8def40d6;p=akkoma

Merge branch 'develop' into 'fix/2412-filters'

# Conflicts:
#   CHANGELOG.md
---

008499f65a33f5d42a98cc3719f6ab5e8def40d6
diff --cc CHANGELOG.md
index 226fa2bbf,b3aa52219..47009abc9
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -63,8 -78,9 +78,10 @@@ 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.
+   - Mastodon API: Fixed creation of scheduled posts with polls.
 +  - Mastodon API: Support for expires_in/expires_at in the Filters.
  </details>
  
  ## Unreleased (Patch)