Merge branch 'revert-a0d734c9' into 'master'

Revert "Merge branch 'grpc-1.2.2' into 'master'" See merge request !10700

Merge branch 'revert-a0d734c9' into 'master'
Revert "Merge branch 'grpc-1.2.2' into 'master'" See merge request !10700
c3bb21ff · Stan Hu · ea24904d · a9cffb80 · c3bb21ff
Commit c3bb21ff authored Apr 14, 2017 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)