Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
authorlain <lain@soykaf.club>
Fri, 19 Jun 2020 12:56:50 +0000 (14:56 +0200)
committerlain <lain@soykaf.club>
Fri, 19 Jun 2020 12:56:50 +0000 (14:56 +0200)

Trivial merge