Merge branch 'less.js/1.5.0-wip'

Conflicts:
	.jshintrc
	Makefile
	package.json
This commit is contained in:
Jon Schlinkert
2013-08-01 06:51:59 -04:00
parent aa7e3cc015
commit 38a8664013
68 changed files with 1285 additions and 679 deletions

2
test/css/import.css vendored
View File

@@ -1,7 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans);
@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
@import url("//ha.com/file.css") (min-width: 100px);
#import-test {
height: 10px;