diff options
author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-04-14 07:43:37 +0000 |
---|---|---|
committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-04-14 07:43:37 +0000 |
commit | a9cffb804b885f82ba53d431addc0d0add92ba09 (patch) | |
tree | 2df6a4bdfc78858d33f8d11deb287e43eca2ab04 | |
parent | 0497d3eadb67f347a6376c77cbd39511e5136bfb (diff) | |
download | gitlab-ce-revert-a0d734c9.tar.gz |
Revert "Merge branch 'grpc-1.2.2' into 'master'"revert-a0d734c9
This reverts merge request !10589
-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) |