Merge branch 'stable'

Browse source

Conflicts:
	doc-src/SASS_CHANGELOG.md
	lib/sass/script/lexer.rb
	test/sass/scss/scss_test.rb

...

This commit is contained in:

Nathan Weizenbaum 2010-11-22 21:33:37 -08:00

parent c20d5fd2f3 67a662e37e

commit 8387596f65

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available