diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-26 12:22:49 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-07-10 22:04:35 +0300 |
| commit | 549a8fa18fa0237497821092dfefe27caf8f04c8 (patch) | |
| tree | 7262c9c55c3cd4ebaccf1605363e7d2ab3a81014 /Gemfile.lock | |
| parent | a0e468b551537d876c2d8cdc1b98b60a1ecd351e (diff) | |
Merge branch 'grpc-1.4' into 'master'
Use grpc 1.4.0
Closes omnibus-gitlab#2414
See merge request !12387
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 2f9d3bfc8ab..674ecdc5427 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,7 +351,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.2.5) + grpc (1.4.0) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |