diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-13 08:01:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-13 08:01:55 +0100 |
| commit | 2c643a552e911be09d543d06537c7a3113f9bb93 (patch) | |
| tree | b8bd28bac4bc5c1f379a5f90f9dc2dcbc6b3848e /Gemfile.lock | |
| parent | bf5248ac28bf817344a8b1b4feda744a0832d32d (diff) | |
| parent | d7a527163b64fa38e46fc6195fef2f5d93e47d07 (diff) | |
| download | gitlab-ce-2c643a552e911be09d543d06537c7a3113f9bb93.tar.gz | |
Merge branch 'master' into notebooklab-in-repo
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d7e3f7343d0..965c888ca79 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.1.2) + grpc (1.2.2) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) |