From: kaniini <ariadne@dereferenced.org>
Date: Fri, 19 Jul 2019 21:36:36 +0000 (+0000)
Subject: Merge branch 'feature/richmedia-ttl' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=33729bbb2834bfa1f223b11d47dc8e3230d47657;p=akkoma

Merge branch 'feature/richmedia-ttl' into 'develop'

add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
---

33729bbb2834bfa1f223b11d47dc8e3230d47657