diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-14 12:31:28 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-14 12:40:36 +0300 |
| commit | 5fac288c2d24fc14df5b3bb022aead45cdea039c (patch) | |
| tree | d92fba678a0c5eb6b70d4216b34063d96240001d | |
| parent | 78854cd84c96437f517b6c5a834afad5fa76ae0a (diff) | |
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) |