Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators...
authorlain <lain@soykaf.club>
Wed, 19 Aug 2020 12:10:11 +0000 (14:10 +0200)
committerlain <lain@soykaf.club>
Wed, 19 Aug 2020 12:10:11 +0000 (14:10 +0200)

Trivial merge