caddy/vendor
Matthew Holt 269a8b5fce
Merge branch 'master' into diagnostics
# Conflicts:
#	plugins.go
#	vendor/manifest
2018-02-16 22:42:14 -07:00
..
cloud.google.com/go/compute/metadata Vendor all dependencies (Warning: Huge changeset.) 2017-05-27 13:30:11 -06:00
github.com Merge branch 'master' into diagnostics 2018-02-16 22:42:14 -07:00
go4.org/syncutil/singleflight Vendor all dependencies (Warning: Huge changeset.) 2017-05-27 13:30:11 -06:00
golang.org/x vendor: Updated quic-go for QUIC 39+ (#1968) 2018-02-16 22:29:53 -07:00
google.golang.org vendor: Update dependencies 2017-07-27 16:11:56 -06:00
gopkg.in vendor: Update dependencies 2017-07-27 16:11:56 -06:00
manifest Merge branch 'master' into diagnostics 2018-02-16 22:42:14 -07:00