Commit Graph

6 Commits

Author SHA1 Message Date
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
robmadole
fd0a94b85e Generate Less files from the icons object 2013-05-23 08:04:02 -05:00
davegandy
a31b2e6b93 auto generating icon category lists, fixing icon alignment in icon list 2013-05-17 21:09:37 -04:00
davegandy
5871fad12b attempting a shot at #739 2013-05-16 22:15:50 -04:00
davegandy
495adab04f updating version references 2013-05-16 20:39:55 -04:00
Sergio
33e4610a6b add npm support 2013-05-16 16:46:03 -03:00