Merge branch 'feature/richmedia-ttl' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 19 Jul 2019 21:36:36 +0000 (21:36 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 19 Jul 2019 21:36:36 +0000 (21:36 +0000)
add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438

1  2 
CHANGELOG.md
config/config.exs

diff --cc CHANGELOG.md
Simple merge
Simple merge