KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 12:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'forkorigin/master' into detect-nemerle-language

Browse Source 
Conflicts:
	lib/linguist/mimes.yml
	test/test_blob.rb
This commit is contained in:
Alex Zimin
2011-07-09 00:16:19 +08:00
parent 41dc2d027a e56f04bc81
commit 8d5232be6b
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/linguist/languages.yml
View File

@@ -495,6 +495,7 @@ Markdown:
- .ron
Matlab:
type: programming
extensions:
- .m
- .matlab