Merge remote-tracking branch 'origin/master' into chrmarti/welcomeexperience

This commit is contained in:
Christof Marti
2017-01-21 11:30:41 -08:00
129 changed files with 4662 additions and 1202 deletions

View File

@@ -41,7 +41,7 @@ const nodeModules = ['electron', 'original-fs']
const builtInExtensions = [
{ name: 'ms-vscode.node-debug', version: '1.9.10' },
{ name: 'ms-vscode.node-debug2', version: '1.9.7' }
{ name: 'ms-vscode.node-debug2', version: '1.9.8' }
];
const vscodeEntryPoints = _.flatten([