Merge branch 'develop' into activation-meta

diff --cc CHANGELOG.md
index e213185800add9d2bb8c833f4ad0ed9f5683b612,335d291959ac6098b5753f62efd810a4034be098..26f878a7627904b4a4507a3222c7ef14dd562b47
--- 1/CHANGELOG.md
--- 2/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>