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)
commit83aeb6090072986d39dc52de05f5a23164f8ce04
tree1f510711f7bad7b69df9d3c2d01f3663d4e126fb
parentbc78a875c86db42d67122cfb767f239a55dacbea
parent1d7033d96289edf0adf2ca61a725f93b345305ec
Merge branch 'activity-expiration' into 'develop'

Activity expiration

See merge request pleroma/pleroma!1595