Merge branch 'master' of https://github.com/numbbbbb/js-beautify · beautifier/js-beautify@92fb252 · GitHub

Commit

Merge branch 'master' of https://github.com/numbbbbb/js-beautify

Browse files

Conflicts:
	js/test/beautify-css-tests.js
	python/cssbeautifier/tests/test.py
	test/data/css.js

Loading branch information

numbbbbb committed Nov 12, 2014

2 parents 5e4058b + fc7ea06 commit 92fb252