Merge branch 'activity-expiration' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 24 Aug 2019 16:01:57 +0000 (16:01 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 24 Aug 2019 16:01:57 +0000 (16:01 +0000)
Activity expiration

See merge request pleroma/pleroma!1595


Trivial merge