0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Bootstrap/js
Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
..
tests get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
.jshintrc some progress on affix plugin 2012-07-22 18:28:39 -07:00
bootstrap-affix.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-alert.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-button.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-carousel.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-collapse.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-dropdown.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-modal.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-popover.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-scrollspy.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-tab.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-tooltip.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
bootstrap-transition.js version bump to 3.0 2012-11-30 22:30:50 -08:00
bootstrap-typeahead.js Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00