From: feld <feld@feld.me>
Date: Tue, 2 Feb 2021 17:11:38 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/2164-unify-api-arguments'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cd5ff7a9430a8e5886983610f1e16f966392a7ee;p=akkoma

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

# Conflicts:
#   CHANGELOG.md
---

cd5ff7a9430a8e5886983610f1e16f966392a7ee
diff --cc CHANGELOG.md
index 628f6f17d,905e35f26..0a24a6a97
--- a/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