Merge branch 'v1.5' into master
This commit is contained in:
commit
bf43149d7e
293 changed files with 23915 additions and 1441 deletions
12
Gopkg.toml
12
Gopkg.toml
|
@ -254,6 +254,18 @@
|
|||
name = "github.com/mailgun/timetools"
|
||||
revision = "7e6055773c5137efbeb3bd2410d705fe10ab6bfd"
|
||||
|
||||
[[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
|
||||
go-tests = true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue