Merge branch 'master' of https://github.com/massiveart/husky into dev… · massiveart/husky@67aa23f · GitHub

Commit

Merge branch 'master' of https://github.com/massiveart/husky into dev…

Browse files

…elop

Conflicts:
	bower.json
	dist/husky.min.css
	package.json

Loading branch information

chirimoya committed May 29, 2015

2 parents 3c27f34 + af5948a commit 67aa23f