Merge branch 'master' into feature/discord

This commit is contained in:
Andrzej Ressel
2018-04-08 20:09:56 +02:00
4486 changed files with 636351 additions and 459241 deletions
+2 -1
View File
@@ -28,7 +28,8 @@ type Webhook struct {
var netTransport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
Timeout: 30 * time.Second,
DualStack: true,
}).Dial,
TLSHandshakeTimeout: 5 * time.Second,
}