Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Thu, 4 Jun 2020 17:24:07 +0000 (19:24 +0200)
committerlain <lain@soykaf.club>
Thu, 4 Jun 2020 17:24:07 +0000 (19:24 +0200)

Trivial merge