Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' 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/components.html docs/css.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/extend.mustache docs/templates/pages/getting-started.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/buttons.less less/forms.less less/navbar.less less/popovers.less less/responsive-767px-max.less less/responsive.less less/tables.less less/tooltip.less less/type.less less/variables.less package.json		2013-01-13 04:26:52 -08:00
..
example-sites	add gallery page, fill with a few screenshots to start	2012-12-04 20:30:21 -08:00
examples	Update the examples index:	2012-12-20 15:08:05 -08:00
bootstrap-docs-readme.png	add readme image	2012-12-21 19:04:59 -08:00
bootstrap-mdo-sfmoma-01.jpg	update version # on homepage, crush assets	2012-06-02 22:12:45 -07:00
bootstrap-mdo-sfmoma-02.jpg	update version # on homepage, crush assets	2012-06-02 22:12:45 -07:00
bootstrap-mdo-sfmoma-03.jpg	update version # on homepage, crush assets	2012-06-02 22:12:45 -07:00
bs-docs-bootstrap-features.png	higher res docs illustrations	2012-11-04 13:23:08 -08:00
bs-docs-masthead-pattern.png	pngcrush masthead pattern to save 10k	2012-07-17 19:55:02 -07:00
bs-docs-responsive-illustrations.png	higher res docs illustrations	2012-11-04 13:23:08 -08:00
bs-docs-twitter-github.png	higher res docs illustrations	2012-11-04 13:23:08 -08:00
grid-baseline-20px.png	optimizing images on 2.1.0-wip branch; saving couple of KBs from package	2012-08-06 13:23:12 +03:00