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

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 226fa2bbfcac4c8eaac6b1f422f87da0ce7a6dec,b3aa52219ca825309c2e6e54097c5d41862ccede..47009abc93f37a41ff552a3e4401ac39b04652aa
--- 1/CHANGELOG.md
--- 2/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)

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/api_spec/operations/filter_operation.ex
Simple merge

diff --cc test/support/factory.ex
Simple merge