Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Tue, 31 Mar 2020 17:06:08 +0000 (19:06 +0200)
committerlain <lain@soykaf.club>
Tue, 31 Mar 2020 17:06:08 +0000 (19:06 +0200)

Trivial merge