diff options
| author | Alex Dima <alexdima@microsoft.com> | 2019-08-21 16:13:14 +0300 |
|---|---|---|
| committer | Alex Dima <alexdima@microsoft.com> | 2019-08-21 16:13:14 +0300 |
| commit | 8f65f5b92cde9f5e08e555fb13c8d3c8a5bc1b72 (patch) | |
| tree | bd2e718d922eb7351986489d88bbec0fa448e822 /remote | |
| parent | 2769a3f60dc2675b9652128b189d698e63383a35 (diff) | |
| parent | ada79d72be36ecbfed6f88bb16edcc5cc3f5c2a8 (diff) | |
Merge remote-tracking branch 'origin/oss/master' into distro
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/package.json | 2 | ||||
| -rw-r--r-- | remote/yarn.lock | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/remote/package.json b/remote/package.json index b7ef8fb000b..81f4822445a 100644 --- a/remote/package.json +++ b/remote/package.json @@ -30,6 +30,6 @@ }, "optionalDependencies": { "vscode-windows-ca-certs": "0.1.0", - "vscode-windows-registry": "1.0.1" + "vscode-windows-registry": "1.0.2" } } diff --git a/remote/yarn.lock b/remote/yarn.lock index fd60301e8e9..9accd7fbbec 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -743,7 +743,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -nan@^2.0.0, nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: +nan@^2.0.0, nan@^2.13.2, nan@^2.14.0: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -1210,12 +1210,10 @@ vscode-windows-ca-certs@0.1.0: dependencies: node-addon-api "1.6.2" -vscode-windows-registry@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.1.tgz#bc9f765563eb6dc1c9ad9a41f9eaacc84dfadc7c" - integrity sha512-q0aKXi9Py1OBdmXIJJFeJBzpPJMMUxMJNBU9FysWIXEwJyMQGEVevKzM2J3Qz/cHSc5LVqibmoUWzZ7g+97qRg== - dependencies: - nan "^2.12.1" +vscode-windows-registry@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.2.tgz#b863e704a6a69c50b3098a55fbddbe595b0c124a" + integrity sha512-/CLLvuOSM2Vme2z6aNyB+4Omd7hDxpf4Thrt8ImxnXeQtxzel2bClJpFQvQqK/s4oaXlkBKS7LqVLeZM+uSVIA== "vsda@https://github.com/microsoft/vsda.git#45edd3db96a5e308a5cfc817d1ee42f6d96e1659": version "1.4.1" |