diff options
| author | Marin Jankovski <marin@gitlab.com> | 2017-08-31 12:24:17 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2017-08-31 12:24:17 +0300 |
| commit | bf51ab887b92275d0e5b51c53889664f8c8db745 (patch) | |
| tree | 59a55cbc1785dd3bda783022d760e4e3beaa6ea4 /Gemfile.lock | |
| parent | 3e092caa91853afeab3bb01be10869e45c39de5d (diff) | |
| parent | cbcbe4b7ea295218732f03a48189d54faf66f5cd (diff) | |
Merge branch 'google-protobuf-3.4.0.2' into 'master'
Use google-protobuf 3.4.0.2
See merge request !13796
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0b267fcfb31..8634a9e8822 100644 --- 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) |