diff options
author | Stan Hu <stanhu@gmail.com> | 2018-01-31 20:37:56 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-01-31 20:37:56 -0800 |
commit | dbcd43db16a7222293cea9b2f2bdf35570ddbc9d (patch) | |
tree | 5384c0bbfcbdc7c58419bd241413d44e7e127f33 | |
parent | f9e9d5d50e04ad5487e004773783aea52ff85d37 (diff) | |
parent | 9291048fc0b4afe228ccf3b59b8260f6ddd09005 (diff) | |
download | gitlab-ce-dbcd43db16a7222293cea9b2f2bdf35570ddbc9d.tar.gz |
Merge branch 'sh-remove-universal-darwin'
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f770a7019e7..2ddf8221a06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.5.1.1-universal-darwin) + google-protobuf (3.5.1.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) googleauth (0.5.3) @@ -369,7 +369,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.8.3-universal-darwin) + grpc (1.8.3) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) |