Merge branch 'revert-a0d734c9' into 'master'
Revert "Merge branch 'grpc-1.2.2' into 'master'" See merge request !10700
This commit is contained in:
commit
c3bb21ff80
|
@ -330,7 +330,7 @@ GEM
|
|||
grape-entity (0.6.0)
|
||||
activesupport
|
||||
multi_json (>= 1.3.2)
|
||||
grpc (1.2.2)
|
||||
grpc (1.1.2)
|
||||
google-protobuf (~> 3.1)
|
||||
googleauth (~> 0.5.1)
|
||||
haml (4.0.7)
|
||||
|
|
Loading…
Reference in New Issue