0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Bootstrap/docs/templates/pages
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
..
base-css.mustache Add text alignment classes info to docs 2013-01-15 18:16:44 -08:00
components.mustache Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-17 20:23:33 -08:00
css.mustache Change .img-polaroid to .img-thumbnail 2013-01-17 20:16:04 -08:00
customize.mustache Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
gallery.mustache Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
getting-started.mustache cleanup example templates 2013-01-17 15:00:49 -08:00
index.mustache dat docs messaging (on the homepage) 2013-01-17 00:23:25 -08:00
javascript.mustache Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-17 20:23:33 -08:00