merge with master

This commit is contained in:
Torkel Ödegaard
2017-10-02 14:14:45 +02:00
209 changed files with 9558 additions and 18150 deletions
+2 -1
View File
@@ -24,7 +24,8 @@ type WebdavUploader struct {
var netTransport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 60 * time.Second,
Timeout: 60 * time.Second,
DualStack: true,
}).Dial,
TLSHandshakeTimeout: 5 * time.Second,
}