Merge branch 'master' into idris

This commit is contained in:
Arfon Smith
2016-04-03 07:51:05 -06:00
5 changed files with 22 additions and 1 deletions

View File

@@ -183,6 +183,9 @@ vendor/grammars/atom-language-stan/:
vendor/grammars/atom-salt:
- source.python.salt
- source.yaml.salt
vendor/grammars/atomic-dreams/:
- source.dm
- source.dmf
vendor/grammars/ats:
- source.ats
vendor/grammars/awk-sublime: