robmadole fab96da267 Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip ...

Conflicts:
	build/assets/font-awesome/css/font-awesome.css
	build/assets/font-awesome/less/icons.less
	build/assets/font-awesome/less/variables.less
	package.json

2013-05-23 08:21:52 -05:00

..

font

addressing all of @gtagliala's issues with font awesome naming conventions

2013-05-21 22:34:14 -04:00

less

Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip

2013-05-23 08:21:52 -05:00