Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma...
authorlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:43 +0000 (14:10 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:43 +0000 (14:10 +0200)

Trivial merge