Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 9 Apr 2020 11:25:27 +0000 (13:25 +0200)
committerlain <lain@soykaf.club>
Thu, 9 Apr 2020 11:25:27 +0000 (13:25 +0200)

Trivial merge