Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 21 May 2019 05:15:29 +0000 (05:15 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 21 May 2019 05:15:29 +0000 (05:15 +0000)
commitbe6b57193a99a32134546efb667391eda4d4acdf
tree81af948c19b3cd2b35e2678c25c46b10728f4985
parent94caca924d94b8d976f4f362515e0d4eb7b9d4fb
parentc972d0bb14ee5a65f053b8c9629d93fc9b94ca78
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'

http: bump connection timeout to 10 seconds

See merge request pleroma/pleroma!1183