Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Thu, 26 Mar 2020 14:24:06 +0000 (15:24 +0100)
committerlain <lain@soykaf.club>
Thu, 26 Mar 2020 14:24:06 +0000 (15:24 +0100)

Trivial merge