From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 2 Jul 2020 18:01:22 +0000 (-0500)
Subject: Merge branch 'develop' into activation-meta
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8121e46f25b2ea74bdcc635cab20bd17183bcca2;p=akkoma

Merge branch 'develop' into activation-meta
---

8121e46f25b2ea74bdcc635cab20bd17183bcca2
diff --cc CHANGELOG.md
index e21318580,335d29195..26f878a76
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -17,7 -17,7 +17,8 @@@ The format is based on [Keep a Changelo
    <summary>API Changes</summary>
  
  - **Breaking:** Emoji API: changed methods and renamed routes.
- - Added `pleroma.metadata.fields_limits` to /api/v1/instance
+ - Streaming: Repeats of a user's posts will no longer be pushed to the user's stream.
++- Mastodon API: Added `pleroma.metadata.fields_limits` to /api/v1/instance
  </details>
  
  <details>