Commit graph

1 commit

Author SHA1 Message Date
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