Merge branch 'master' into new-grammars

This commit is contained in:
Paul Chaignon
2015-02-09 23:19:37 +01:00
8 changed files with 14 additions and 5 deletions

3
.gitmodules vendored
View File

@@ -612,3 +612,6 @@
[submodule "vendor/grammars/sublime-opal"]
path = vendor/grammars/sublime-opal
url = https://github.com/artifactz/sublime-opal
[submodule "vendor/grammars/mediawiki.tmbundle"]
path = vendor/grammars/mediawiki.tmbundle
url = https://github.com/textmate/mediawiki.tmbundle