Merge branch 'chore/fix-flakey-aws-test' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 20 Aug 2019 20:28:54 +0000 (20:28 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 20 Aug 2019 20:28:54 +0000 (20:28 +0000)
commit73884441f31092bdb2f509950daf9bd3889a9a8b
treef9532e0e6c430d5f58a94430f9b88eb2ac4ff323
parent74f7f308f879b26a261db3b5c1d389cea898541c
parent76bb3572dddf1e35697e071c94aa327382f0b990
Merge branch 'chore/fix-flakey-aws-test' into 'develop'

test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1

See merge request pleroma/pleroma!1587