Merge branch 'master' into 985

Conflicts:
	lib/linguist/languages.yml
This commit is contained in:
Arfon Smith
2014-05-04 09:04:28 -05:00
14 changed files with 1468 additions and 82 deletions

View File

@@ -306,6 +306,10 @@ class TestBlob < Test::Unit::TestCase
assert blob("public/javascripts/angular.js").vendored?
assert blob("public/javascripts/angular.min.js").vendored?
# D3.js
assert blob("public/javascripts/d3.v3.js").vendored?
assert blob("public/javascripts/d3.v3.min.js").vendored?
# Fabric
assert blob("fabfile.py").vendored?