diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-14 09:31:28 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-04-14 09:31:28 +0000 |
| commit | c3bb21ff800699bed829a30c75fa81fd0d4dab8d (patch) | |
| tree | 568a5892525a8ae69a0f0d971f3dcc9ff892b8dc | |
| parent | ea24904db818f4bfa248ef56b751400a674ed05d (diff) | |
| parent | a9cffb804b885f82ba53d431addc0d0add92ba09 (diff) | |
| download | gitlab-ce-c3bb21ff800699bed829a30c75fa81fd0d4dab8d.tar.gz | |
Merge branch 'revert-a0d734c9' into 'master'
Revert "Merge branch 'grpc-1.2.2' into 'master'"
See merge request !10700
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 965c888ca79..d7e3f7343d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.2.2) + grpc (1.1.2) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |