Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 2 Jun 2020 08:43:13 +0000 (10:43 +0200)
committerlain <lain@soykaf.club>
Tue, 2 Jun 2020 08:43:13 +0000 (10:43 +0200)

Trivial merge