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)
commit33729bbb2834bfa1f223b11d47dc8e3230d47657
treec168dab53cb5868f7c0939f99e20f031124a1d54
parentc1c64d6d06fb7307245880d6605d9d9153a4784f
parent581756ccc50cc08823957a2f24f506bf23c7cd22
Merge branch 'feature/richmedia-ttl' into 'develop'

add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
CHANGELOG.md
config/config.exs