Merge branch 'master' into apollo

This commit is contained in:
Arfon Smith
2016-07-13 09:38:38 -06:00
7 changed files with 117 additions and 0 deletions

View File

@@ -334,6 +334,8 @@ vendor/grammars/language-apl:
vendor/grammars/language-babel/:
- source.js.jsx
- source.regexp.babel
vendor/grammars/language-blade/:
- text.html.php.blade
vendor/grammars/language-click/:
- source.click
vendor/grammars/language-clojure: