Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 15:52:30 +0000 (16:52 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 15:52:30 +0000 (16:52 +0100)

Trivial merge