Commit c3bb21ff authored by Stan Hu's avatar Stan Hu

Merge branch 'revert-a0d734c9' into 'master'

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

See merge request !10700
parents ea24904d a9cffb80
...@@ -330,7 +330,7 @@ GEM ...@@ -330,7 +330,7 @@ GEM
grape-entity (0.6.0) grape-entity (0.6.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grpc (1.2.2) grpc (1.1.2)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleauth (~> 0.5.1) googleauth (~> 0.5.1)
haml (4.0.7) haml (4.0.7)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment