Mark Otto a70c50d1f7 Merge branch 'master' 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/index.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 package.json		2013-03-01 12:37:21 -08:00
..
css	Fix alignment of .navbar-brand	2013-03-01 00:50:08 -08:00
fonts	rearrange jekyll and docs	2013-02-12 12:44:41 -08:00
ico	rearrange jekyll and docs	2013-02-12 12:44:41 -08:00
img	add new example thumbnails; update links to point to new windows	2013-02-26 00:56:06 -08:00
js	Merge branch 'master' into 3.0.0-wip	2013-03-01 12:37:21 -08:00