Files
linguist/test/test_mime.rb
Alex Zimin 8d5232be6b Merge remote-tracking branch 'forkorigin/master' into detect-nemerle-language
Conflicts:
	lib/linguist/mimes.yml
	test/test_blob.rb
2011-07-09 00:16:19 +08:00

7.5 KiB