Mark Otto 72f13e2870 Merge branch '2.2.3' into 3.0.0-wip ... Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/responsive.less less/type.less package.json		2012-12-20 00:02:52 -08:00
..
assets	Merge branch '2.2.3' into 3.0.0-wip	2012-12-20 00:02:52 -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.3' into 3.0.0-wip	2012-12-20 00:02:52 -08:00
templates	Merge branch '2.2.3' into 3.0.0-wip	2012-12-20 00:02:52 -08:00
components.html	Change .jumbotron usage in docs layout to .bs-docs-jumbotron	2012-12-19 21:42:36 -08:00
css.html	Holy shit, buttons, button states, and input states updated	2012-12-19 23:37:33 -08:00
customize.html	Change .jumbotron usage in docs layout to .bs-docs-jumbotron	2012-12-19 21:42:36 -08:00
extend.html	Change .jumbotron usage in docs layout to .bs-docs-jumbotron	2012-12-19 21:42:36 -08:00
gallery.html	Change .jumbotron usage in docs layout to .bs-docs-jumbotron	2012-12-19 21:42:36 -08:00
getting-started.html	Change .jumbotron usage in docs layout to .bs-docs-jumbotron	2012-12-19 21:42:36 -08:00
index.html	Merge branch '2.2.3' into 3.0.0-wip	2012-12-20 00:02:52 -08:00
javascript.html	Merge branch '2.2.3' into 3.0.0-wip	2012-12-20 00:02:52 -08:00