diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-31 09:42:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-31 09:42:21 +0000 |
| commit | 32dde25a15ab9ccf22aca34c2c553fcdcc573ed3 (patch) | |
| tree | a45b0e147f013a21ce3a1c8d430dbb3f52707df9 | |
| parent | 8039b9c3c6caedc19e0e44d086a007e8975134b7 (diff) | |
| parent | cdb103003152828f18ee10d7eade69cc04d8be4e (diff) | |
| download | gitlab-ce-32dde25a15ab9ccf22aca34c2c553fcdcc573ed3.tar.gz | |
Merge branch 'revert-5b67839b' into 'master'
Revert "Merge branch 'grpc-1.3.4' into 'master'"
See merge request !11813
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
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) |