mirror of
https://github.com/KevinMidboe/linguist.git
synced 2026-02-10 18:29:34 +00:00
Merge remote-tracking branch 'upstream/master' into wavefront
Resolves conflicts: .gitmodules
This commit is contained in:
@@ -345,6 +345,10 @@ vendor/grammars/language-csharp:
|
||||
- source.cs
|
||||
- source.csx
|
||||
- source.nant-build
|
||||
vendor/grammars/language-csound:
|
||||
- source.csound
|
||||
- source.csound-document
|
||||
- source.csound-score
|
||||
vendor/grammars/language-gfm:
|
||||
- source.gfm
|
||||
vendor/grammars/language-graphql:
|
||||
|
||||
Reference in New Issue
Block a user