From: lain <lain@soykaf.club>
Date: Tue, 3 Nov 2020 13:11:36 +0000 (+0000)
Subject: Merge branch 'patch-4' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7;p=akkoma

Merge branch 'patch-4' into 'develop'

ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled

Closes #2217

See merge request pleroma/pleroma!3089
---

f7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7