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

Use google-protobuf 3.4.0.2 See merge request !13796

Merge branch 'google-protobuf-3.4.0.2' into 'master'
Use google-protobuf 3.4.0.2 See merge request !13796
bf51ab88 · Marin Jankovski · 3e092caa · cbcbe4b7 · bf51ab88
Commit bf51ab88 authored Aug 31, 2017 by Marin Jankovski
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
      multi_json (~> 1.10)
      retriable (~> 1.4)
      signet (~> 0.6)
-    google-protobuf (3.3.0)
+    google-protobuf (3.4.0.2)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)