Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe...
authorlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)

Trivial merge