diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-13 11:17:11 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-13 11:17:11 +0000 |
| commit | 3dbfd29837bd6a338ee44af4ff4b5322ef5a287b (patch) | |
| tree | d0fbb33c35dc3fa8863d37965db0afbdd584a6df | |
| parent | c616200f821be630d6238a00ff08a77a60aeebe2 (diff) | |
| parent | cc545a80034dc0e9fec7cf47b4c32d4f1eada9dd (diff) | |
| download | gitlab-ce-3dbfd29837bd6a338ee44af4ff4b5322ef5a287b.tar.gz | |
Merge branch 'google-protobuf-3.4.1.1' into 'master'
Use google-protobuf 3.4.1.1
See merge request gitlab-org/gitlab-ce!14820
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f5712da7508..b8b8054ad74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -324,7 +324,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.0.2) + google-protobuf (3.4.1.1) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) |