0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Bootstrap/docs/templates/pages
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
..
base-css.mustache Merge branch '2.1.2-wip' into exploratory 2012-10-01 11:27:40 -07:00
components.mustache Merge branch '2.1.2-wip' into exploratory 2012-10-01 23:41:00 -07:00
customize.mustache add the media css to customizer 2012-09-17 18:17:22 -07:00
extend.mustache Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
getting-started.mustache Merge branch '2.1.2-wip' into exploratory 2012-09-30 22:45:39 -07:00
index.mustache Merge branch '2.1.2-wip' into exploratory 2012-09-30 22:45:39 -07:00
javascript.mustache Merge branch '2.1.2-wip' into exploratory 2012-10-01 23:41:00 -07:00
scaffolding.mustache Merge branch '2.1.2-wip' into exploratory 2012-10-01 11:27:40 -07:00