David Storey 23db8835f5 Merge branch 'Microsoft/master' into update-css-intellisense ... # Conflicts: # src/vs/languages/html/common/htmlTags.ts		2015-12-08 17:03:17 -08:00
..
snippets	Hello Code	2015-11-13 14:39:38 +01:00
syntaxes	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00
javascript.configuration.json	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00
OSSREADME.json	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00
package.json	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00