Merge branch 'develop' into 'feature/2164-unify-api-arguments'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 628f6f17d42ad6ef9f62de77afc6a6d37b0a0c86,905e35f266f31ea215c37fffb5cba7213a4e95a1..0a24a6a97d54a0e0ed605009ebe7dd900dd63809
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -48,8 -48,8 +48,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
  - Admin API: An endpoint to manage frontends.
  - Streaming API: Add follow relationships updates.
 -- WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types
 -- Mastodon API: Add monthly active users to `/api/v1/instance` (`pleroma.stats.mau`)
 +- WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types.
++- Mastodon API: Add monthly active users to `/api/v1/instance` (`pleroma.stats.mau`).
 +- Mastodon API: Home, public, hashtag & list timelines accept `only_media`, `remote` & `local` parameters for filtration.
  </details>
  
  ### Fixed