Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
authorlain <lain@soykaf.club>
Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)
committerlain <lain@soykaf.club>
Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)

Trivial merge