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
..
syntaxes	Add source.regexp.python rules	2015-11-13 18:25:18 +01:00
OSSREADME.json	Hello Code	2015-11-13 14:39:38 +01:00
package.json	Merge branch 'Microsoft/master' into update-css-intellisense	2015-12-08 17:03:17 -08:00
python.configuration.json	Python: Block comment is three single quotes and not two #18	2015-11-16 10:49:28 +01:00