Merge branch 'patch-4' into 'develop'
authorlain <lain@soykaf.club>
Tue, 3 Nov 2020 13:11:36 +0000 (13:11 +0000)
committerlain <lain@soykaf.club>
Tue, 3 Nov 2020 13:11:36 +0000 (13:11 +0000)
commitf7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7
tree5e2e3767cce93218ae162bd564673d830f2d3e1b
parent0d8cc0905aeebb965df0cf755a171d21b01ed978
parentc37118e6f26f0305d540047e4ccb8d594d2c0e6b
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