Merge branch 'develop' into issue/1276

diff --cc CHANGELOG.md
index c14c8c0e16189734df4bcf331ff74f31e552d379,77edf7bf0d2897e780013109b3e7e061e853131b..b86c9fad8ac0af5b3b993c4549cfde53cc3fc778
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -27,7 -27,7 +27,8 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
  - Mastodon API: `pleroma.thread_muted` to the Status entity
  - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
+ - Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
 +- Mastodon API: Add `pleroma.unread_count` to the Marker entity
  </details>
  
  ### Added