Mark Otto 0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip ... Conflicts: docs/assets/css/bootstrap.css less/type.less		2013-02-04 11:12:09 -08:00
..
css	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-02-04 11:12:09 -08:00
fonts	removing glyphicons images, swapping in new icon font with new classes	2012-11-02 01:20:06 -07:00
ico	fixes #5717: add retina favicon, recompile docs	2012-10-31 10:41:41 -07:00
img	Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes	2013-01-31 18:25:44 -08:00
js	Verion number in JS makefile	2013-02-02 18:50:13 -08:00