From: feld <feld@feld.me>
Date: Thu, 13 Aug 2020 17:38:19 +0000 (+0000)
Subject: Merge branch 'fix/activity-expirations-again' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=14a06e63f661cc964a799a62c87103a00ba0c5e0;hp=14a06e63f661cc964a799a62c87103a00ba0c5e0;p=akkoma

Merge branch 'fix/activity-expirations-again' into 'develop'

Fix activity expirations again

See merge request pleroma/pleroma!2866
---