Merge branch 'master' into 3233-local

This commit is contained in:
Arfon Smith
2016-10-25 20:00:48 -04:00
34 changed files with 2650 additions and 49 deletions

View File

@@ -136,7 +136,7 @@ vendor/grammars/X10:
- source.x10
vendor/grammars/abap.tmbundle:
- source.abap
vendor/grammars/actionscript3-tmbundle:
vendor/grammars/actionscript3-tmbundle/:
- source.actionscript.3
- text.html.asdoc
- text.xml.flex-config