Merge remote-tracking branch 'origin/master' into 2_0_0

Conflicts:
	CHANGELOG.md
	lib/less/index.js
	lib/less/parser/parser.js
	lib/less/tree/dimension.js
This commit is contained in:
Luke Page
2014-09-05 23:31:42 +01:00
11 changed files with 17879 additions and 6 deletions

View File

@@ -138,6 +138,8 @@
percent: true;
em: true;
cat: true;
case-insensitive-1: true;
case-insensitive-2: true;
}
#alpha {
alpha: rgba(153, 94, 51, 0.6);