Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 1 Jun 2020 11:34:13 +0000 (13:34 +0200)
committerlain <lain@soykaf.club>
Mon, 1 Jun 2020 11:34:13 +0000 (13:34 +0200)

Trivial merge