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

Revert "Merge branch 'grpc-1.3.4' into 'master'" See merge request !11813

Merge branch 'revert-5b67839b' into 'master'
Revert "Merge branch 'grpc-1.3.4' into 'master'" See merge request !11813
32dde25a · Sean McGivern · 8039b9c3 · cdb10300 · 32dde25a
Commit 32dde25a authored May 31, 2017 by Sean McGivern
Show 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
@@ -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)