Merge branch 'google-protobuf-3.2.0.1' into 'master'

Use google-protobuf 3.2.0.1 Closes #29084 See merge request !9932

Merge branch 'google-protobuf-3.2.0.1' into 'master'
e52529e2 · Rémy Coutable · d51a8793 · 1324a6b3 · e52529e2
Commit e52529e2 authored Mar 14, 2017 by Rémy Coutable
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)
+    google-protobuf (3.2.0.1)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)