Merge branch 'revert-5b67839b' into 'master'

Revert "Merge branch 'grpc-1.3.4' into 'master'"

See merge request !11813
This commit is contained in:
Sean McGivern 2017-05-31 09:42:21 +00:00
commit 32dde25a15

View file

@ -341,7 +341,7 @@ GEM
grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2)
grpc (1.3.4)
grpc (1.2.5)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
haml (4.0.7)