Merge branch 'master' into 3020-local

This commit is contained in:
Arfon Smith
2016-06-02 10:55:46 -06:00
10 changed files with 237 additions and 8 deletions

View File

@@ -36,7 +36,7 @@ vendor/grammars/ColdFusion:
- text.html.cfm
vendor/grammars/Docker.tmbundle:
- source.dockerfile
vendor/grammars/Elm.tmLanguage:
vendor/grammars/Elm/:
- source.elm
vendor/grammars/FreeMarker.tmbundle:
- text.html.ftl
@@ -441,6 +441,8 @@ vendor/grammars/ninja.tmbundle:
- source.ninja
vendor/grammars/nix:
- source.nix
vendor/grammars/nu.tmbundle:
- source.nu
vendor/grammars/objective-c.tmbundle:
- source.objc
- source.objc++