Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Fri, 15 May 2020 11:33:04 +0000 (13:33 +0200)
committerlain <lain@soykaf.club>
Fri, 15 May 2020 11:33:04 +0000 (13:33 +0200)

Trivial merge