Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
authorlain <lain@soykaf.club>
Thu, 17 Sep 2020 11:26:04 +0000 (13:26 +0200)
committerlain <lain@soykaf.club>
Thu, 17 Sep 2020 11:26:04 +0000 (13:26 +0200)

Trivial merge