Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip ... Conflicts: docs/assets/css/bootstrap.css docs/components.html docs/css.html docs/customize.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/javascript.html docs/scaffolding.html docs/templates/layout.mustache docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache less/navbar.less		2013-01-17 20:23:33 -08:00
..
assets	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
build	Changing title of docs pages to simply say 'Bootstrap' like the docs home page	2012-10-07 21:38:28 -07:00
examples	Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing	2013-01-14 00:11:55 -08:00
templates	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
base-css.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
components.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
css.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
customize.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
extend.html	Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing	2013-01-14 00:11:55 -08:00
gallery.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
getting-started.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
index.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
javascript.html	Merge branch '2.3.0-wip' into 3.0.0-wip	2013-01-17 20:23:33 -08:00
scaffolding.html	Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing	2013-01-14 00:11:55 -08:00