1
0
Fork 0

Merge branch 'v1.5' into master

This commit is contained in:
Fernandez Ludovic 2018-03-08 01:12:36 +01:00
commit 4831890232
14 changed files with 740 additions and 193 deletions

View file

@ -245,10 +245,6 @@
revision = "a8b993ba6abdb0e0c12b0125c603323a71c7790c"
source = "github.com/ijc25/Gotty"
[[override]]
name = "github.com/gorilla/websocket"
revision = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"
[[override]]
# ALWAYS keep this override
name = "github.com/mailgun/timetools"
@ -257,14 +253,6 @@
[[override]]
branch = "master"
name = "github.com/miekg/dns"
#
#[[override]]
# name = "golang.org/x/crypto"
# revision = "13931e22f9e72ea58bb73048bc752b48c6d4d4ac"
#
#[[override]]
# name = "golang.org/x/net"
# revision = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec"
[prune]
non-go = true