Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expira...
authorlain <lain@soykaf.club>
Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)
committerlain <lain@soykaf.club>
Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)

Trivial merge