diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-14 17:03:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-14 17:03:50 +0000 |
| commit | e52529e25c8f4b597bbf4ae2815f570b4e4a9898 (patch) | |
| tree | 5f8d44b6b12a04bfa67c793a9eb7ba642f05d07e | |
| parent | d51a8793fd3bc8cb15239fc735a530cc1881a9ac (diff) | |
| parent | 1324a6b3050a121eae722258302ce46bf2636ac1 (diff) | |
| download | gitlab-ce-e52529e25c8f4b597bbf4ae2815f570b4e4a9898.tar.gz | |
Merge branch 'google-protobuf-3.2.0.1' into 'master'
Use google-protobuf 3.2.0.1
Closes #29084
See merge request !9932
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c60c045a4c2..e38f45b8e98 100644 --- 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) |