Merge branch 'master' into 2171-local

This commit is contained in:
Arfon Smith
2015-02-26 21:13:18 -06:00
16 changed files with 1441 additions and 4 deletions

View File

@@ -492,6 +492,8 @@ vendor/grammars/sublime-text-ox/:
- source.ox
vendor/grammars/sublime-text-pig-latin/:
- source.pig_latin
vendor/grammars/sublime-varnish:
- source.varnish.vcl
vendor/grammars/sublime_cobol:
- source.acucobol
- source.cobol