From: kaniini <ariadne@dereferenced.org>
Date: Sat, 24 Aug 2019 16:01:57 +0000 (+0000)
Subject: Merge branch 'activity-expiration' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=83aeb6090072986d39dc52de05f5a23164f8ce04;p=akkoma

Merge branch 'activity-expiration' into 'develop'

Activity expiration

See merge request pleroma/pleroma!1595
---

83aeb6090072986d39dc52de05f5a23164f8ce04