Merge remote-tracking branch 'origin/master' into tyriar/puppeteer

This commit is contained in:
Daniel Imms
2019-07-15 10:34:58 -07:00
173 changed files with 3112 additions and 1763 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.37.0",
"distro": "4d4ca170652edf13efd5916e009bdc9c0d4d1103",
"distro": "a76f8ddb784119243aa004071cea17c5a74b1e60",
"author": {
"name": "Microsoft Corporation"
},
@@ -29,7 +29,6 @@
},
"dependencies": {
"applicationinsights": "1.0.8",
"getmac": "1.4.1",
"graceful-fs": "4.1.11",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.1",
@@ -157,4 +156,4 @@
"windows-mutex": "0.2.1",
"windows-process-tree": "0.2.4"
}
}
}