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

Conflicts:
	lib/linguist/mimes.yml
	test/test_blob.rb
This commit is contained in:
Alex Zimin
2011-07-09 00:16:19 +08:00
4 changed files with 7 additions and 1 deletions

View File

@@ -173,6 +173,7 @@ class TestMime < Test::Unit::TestCase
assert Mime.text?('.sh')
assert Mime.text?('.sig')
assert Mime.text?('.sml')
assert Mime.text?('.sps')
assert Mime.text?('.src')
assert Mime.text?('.tcl')
assert Mime.text?('.texi')