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 fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
..
base-css.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-30 00:13:30 -08:00
components.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-30 00:13:30 -08:00
customize.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-09 10:09:04 -08:00
extend.mustache Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
getting-started.mustache Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
index.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-22 22:04:21 -08:00
javascript.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-22 22:04:21 -08:00
scaffolding.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-15 09:15:37 -08:00