diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-11-18 16:14:55 -0700 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-11-18 16:14:55 -0700 |
| commit | 12cc69ab7adee166042795773874b9d4d38c8d57 (patch) | |
| tree | b45291e7bd8449abbcb580df9ef217b324bc21dd /go.mod | |
| parent | 349457cc1b386e92b348846a354807d6ceeb81df (diff) | |
| parent | 6ea6f3ebe08442dc24321216b7cb7922a07f2e88 (diff) | |
Merge branch 'master' of https://github.com/caddyserver/caddy
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ require ( github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 go.uber.org/zap v1.15.0 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de - golang.org/x/net v0.0.0-20200707034311-ab3426394381 + golang.org/x/net v0.0.0-20201110031124-69a78807bb2b google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98 google.golang.org/protobuf v1.24.0 // cannot upgrade until warning is fixed gopkg.in/natefinch/lumberjack.v2 v2.0.0 |