Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
authorlain <lain@soykaf.club>
Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)
committerlain <lain@soykaf.club>
Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)

Trivial merge