Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -17,8 +17,8 @@
"watch": "gulp watch-extension:configuration-editing"
},
"dependencies": {
"jsonc-parser": "^1.0.0",
"vscode-nls": "^3.2.4"
"jsonc-parser": "2.0.2",
"vscode-nls": "^4.0.0"
},
"contributes": {
"languages": [
@@ -96,6 +96,6 @@
]
},
"devDependencies": {
"@types/node": "7.0.4"
"@types/node": "^8.10.25"
}
}
}