bootstrap/docs
Mark Otto 83e5c01856 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
2013-01-31 17:57:31 -08:00
..
assets Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-31 17:57:31 -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 remove .navbar-inner from sticky footer navbar 2013-01-19 09:40:26 -08:00
templates Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-31 17:57:31 -08:00
base-css.html Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-31 17:57:31 -08:00
components.html Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-31 17:57:31 -08:00
css.html comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
customize.html comment tweaks and updating starter template 2013-01-17 20:28:05 -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 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
getting-started.html Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-31 17:57:31 -08:00
index.html comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
javascript.html comment tweaks and updating starter template 2013-01-17 20:28:05 -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