Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
authorlain <lain@soykaf.club>
Sat, 26 May 2018 14:26:14 +0000 (16:26 +0200)
committerlain <lain@soykaf.club>
Sat, 26 May 2018 14:26:14 +0000 (16:26 +0200)

Trivial merge