From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 16 Jun 2020 18:10:00 +0000 (+0000)
Subject: Merge branch '1866-last-status-stuff' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b536e57124fda9adeb4c78739d0eb2be80d47f6e;p=akkoma

Merge branch '1866-last-status-stuff' into 'develop'

Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647
---

b536e57124fda9adeb4c78739d0eb2be80d47f6e
diff --cc CHANGELOG.md
index d2629bf84,c546f1f04..2f291ad2a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,8 -6,8 +6,9 @@@ The format is based on [Keep a Changelo
  ## [unreleased]
  
  ### Changed
+ - In Conversations, return only direct messages as `last_status`
  - MFR policy to set global expiration for all local Create activities
 +- OGP rich media parser merged with TwitterCard
  <details>
    <summary>API Changes</summary>
  - **Breaking:** Emoji API: changed methods and renamed routes.