Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 6 Apr 2020 15:50:31 +0000 (17:50 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Apr 2020 15:50:31 +0000 (17:50 +0200)

Trivial merge