Merge remote-tracking branch 'github/master' into chapel-lang

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Thomas Van Doren
2014-07-05 11:52:58 -07:00
9 changed files with 116 additions and 10858 deletions

View File

@@ -385,6 +385,9 @@ class TestBlob < Test::Unit::TestCase
# NuGet Packages
assert blob("packages/Modernizr.2.0.6/Content/Scripts/modernizr-2.0.6-development-only.js").vendored?
# Cocoapods
assert blob('Pods/blah').vendored?
# Html5shiv
assert blob("Scripts/html5shiv.js").vendored?