Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip ... Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less		2012-12-05 11:05:10 -08:00
..
assets	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -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	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
templates	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
components.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
css.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
customize.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
extend.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
gallery.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
getting-started.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
index.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00
javascript.html	Merge branch '2.2.2-wip' into 3.0.0-wip	2012-12-05 11:05:10 -08:00