Merge branch 'Microsoft/master' into update-css-intellisense

Browse Source

# Conflicts:
#	src/vs/languages/html/common/htmlTags.ts

...

This commit is contained in:

David Storey

2015-12-08 17:03:17 -08:00

parent db6f0f960e

commit 23db8835f5

504 changed files with 30211 additions and 27525 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

extensions/javascript/syntaxes/JavaScript.tmLanguage

+1596 -566

File diff suppressed because it is too large Load Diff