Merge branch 'revert-e52529e2' into 'master'

Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'" See merge request !9971

Merge branch 'revert-e52529e2' into 'master'
Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'" See merge request !9971
6bddbb1f · Sean McGivern · 53d4cad1 · 952e148d · 6bddbb1f
Commit 6bddbb1f authored Mar 15, 2017 by Sean McGivern
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
@@ -304,7 +304,7 @@ GEM
      multi_json (~> 1.10)
      retriable (~> 1.4)
      signet (~> 0.6)
-    google-protobuf (3.2.0.1)
+    google-protobuf (3.2.0)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)