From: Maksim Pechnikov <parallel588@gmail.com>
Date: Mon, 4 Nov 2019 17:24:53 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1276
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ff6c727739484df31335d2675fbd2446cc5435e1;p=akkoma

Merge branch 'develop' into issue/1276
---

ff6c727739484df31335d2675fbd2446cc5435e1
diff --cc CHANGELOG.md
index c14c8c0e1,77edf7bf0..b86c9fad8
--- a/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