diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-25 13:46:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-25 13:46:26 +0000 |
| commit | 5b67839bc33baa5a7cd85aee881f21e4d8fcaa5a (patch) | |
| tree | 0fcc0310dbb566962a6bf1153288adbd8268dd78 | |
| parent | 1ed7b7629a2c0fbcdfeeda386ec6292e57728e74 (diff) | |
| parent | 20c1015d50bf4dcdb308f1fd7ec3cb5b8bff0922 (diff) | |
| download | gitlab-ce-5b67839bc33baa5a7cd85aee881f21e4d8fcaa5a.tar.gz | |
Merge branch 'grpc-1.3.4' into 'master'
Use grpc 1.3.4
See merge request !11645
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 873cd8781ef..dd2c85052f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -341,7 +341,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.2.5) + grpc (1.3.4) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |