Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma...
authorlain <lain@soykaf.club>
Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)
committerlain <lain@soykaf.club>
Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)

Trivial merge