Mark Otto 09dde5c84a Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip ... Conflicts: docs/assets/css/bootstrap.css less/mixins.less		2012-12-19 23:18:02 -08:00
..
css	Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip	2012-12-19 23:18:02 -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	add gallery page, fill with a few screenshots to start	2012-12-04 20:30:21 -08:00
js	Merge branch 'master' into 3.0.0-wip	2012-12-08 17:40:42 -08:00