From cdb103003152828f18ee10d7eade69cc04d8be4e Mon Sep 17 00:00:00 2001 From: "Jacob Vosmaer (GitLab)" Date: Wed, 31 May 2017 08:09:07 +0000 Subject: Revert "Merge branch 'grpc-1.3.4' into 'master'" This reverts merge request !11645 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b3968d58ed0..273a69792ef 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.3.4) + grpc (1.2.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) -- cgit v1.2.1