diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-03-13 12:54:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 12:54:22 -0400 |
| commit | c281ee3b61e8ab53ff118866d72618ae8cce582b (patch) | |
| tree | 776e7bdf6c8bfbb9a1dee5976496ab065959991f /vendor/github.com/golang/protobuf/descriptor/descriptor.go | |
| parent | 3ada7a41a7fb13abef19dd63dc56b720900dbaa9 (diff) | |
| download | chat-c281ee3b61e8ab53ff118866d72618ae8cce582b.tar.gz chat-c281ee3b61e8ab53ff118866d72618ae8cce582b.tar.bz2 chat-c281ee3b61e8ab53ff118866d72618ae8cce582b.zip | |
Updating server dependancies. Also adding github.com/jaytaylor/html2text and gopkg.in/gomail.v2 (#5748)
Diffstat (limited to 'vendor/github.com/golang/protobuf/descriptor/descriptor.go')
| -rw-r--r-- | vendor/github.com/golang/protobuf/descriptor/descriptor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/descriptor/descriptor.go b/vendor/github.com/golang/protobuf/descriptor/descriptor.go index 83607ff6c..ac7e51bfb 100644 --- a/vendor/github.com/golang/protobuf/descriptor/descriptor.go +++ b/vendor/github.com/golang/protobuf/descriptor/descriptor.go @@ -43,7 +43,7 @@ import ( "io/ioutil" "github.com/golang/protobuf/proto" - protobuf "google.golang.org/genproto/protobuf" + protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor" ) // extractFile extracts a FileDescriptorProto from a gzip'd buffer. |