Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 21 Jul 2019 16:05:58 +0000 (16:05 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 21 Jul 2019 16:05:58 +0000 (16:05 +0000)
commita00aab340275036858aecfef16b719abde3276c6
tree2ea1e1fa644657ca3dd44d7bb4aa1585dabbaeeb
parent1689a11a80be21456788d1f41c4ef231b0a0e94e
parent33681747857eec90ff56ea0342d2ea179c4f856e
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'

Fix rich media parser failing when no TTL can be found by image TTL setters

See merge request pleroma/pleroma!1460