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
..
launch.json	launch.json: add 'Attach to VSCode' configuration.	2015-11-16 14:34:15 +01:00
settings.json	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00
tasks.json	Hello Code	2015-11-13 14:39:38 +01:00