mirror of
https://github.com/KevinMidboe/linguist.git
synced 2026-03-09 15:39:33 +00:00
Merge remote-tracking branch 'upstream/master' into plsql
Conflicts: .gitmodules
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -594,6 +594,12 @@
|
||||
[submodule "vendor/grammars/ec.tmbundle"]
|
||||
path = vendor/grammars/ec.tmbundle
|
||||
url = https://github.com/ecere/ec.tmbundle
|
||||
[submodule "vendor/grammars/InnoSetup"]
|
||||
path = vendor/grammars/InnoSetup
|
||||
url = https://github.com/idleberg/InnoSetup-Sublime-Text
|
||||
[submodule "vendor/grammars/mediawiki.tmbundle"]
|
||||
path = vendor/grammars/mediawiki.tmbundle
|
||||
url = https://github.com/textmate/mediawiki.tmbundle
|
||||
[submodule "vendor/grammars/oracle.tmbundle"]
|
||||
path = vendor/grammars/oracle.tmbundle
|
||||
url = https://github.com/mulander/oracle.tmbundle.git
|
||||
|
||||
Reference in New Issue
Block a user