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

This reverts commit ac2c670d

Revert "Merge branch 'grpc-update' into 'master'"
1ff9e796 · Winnie Hellmann · 40af0888 · 1ff9e796
Commit 1ff9e796 authored Nov 23, 2017 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,10 +354,10 @@ GEM
      rake
    grape_logging (1.7.0)
      grape
-    grpc (1.7.2)
+    grpc (1.6.6)
      google-protobuf (~> 3.1)
      googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
+      googleauth (~> 0.5.1)
    haml (4.0.7)
      tilt
    haml_lint (0.26.0)