0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Bootstrap/js
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
..
tests shiiiit 2013-02-28 21:15:33 -08:00
.jshintrc some progress on affix plugin 2012-07-22 18:28:39 -07:00
bootstrap-affix.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-alert.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-button.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-carousel.js Merge branch 'master' into 3.0.0-wip 2013-03-01 12:37:21 -08:00
bootstrap-collapse.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-dropdown.js Merge branch 'master' into 3.0.0-wip 2013-03-01 12:37:21 -08:00
bootstrap-modal.js Merge branch 'master' into 3.0.0-wip 2013-03-01 12:37:21 -08:00
bootstrap-popover.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-scrollspy.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-tab.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-tooltip.js Merge branch 'master' into 3.0.0-wip 2013-03-01 12:37:21 -08:00
bootstrap-transition.js 2.3.1 2013-02-28 20:55:14 -08:00
bootstrap-typeahead.js 2.3.1 2013-02-28 20:55:14 -08:00