Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less

2013-02-05 22:42:54 -08:00

..

tests

clean up styles

2013-02-05 22:29:59 -08:00

.jshintrc

some progress on affix plugin

2012-07-22 18:28:39 -07:00

bootstrap-affix.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-alert.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-button.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-carousel.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -08:00

bootstrap-collapse.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -08:00

bootstrap-dropdown.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -08:00

bootstrap-modal.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-popover.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -08:00

bootstrap-scrollspy.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-01-13 04:26:52 -08:00

bootstrap-tab.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-tooltip.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -08:00

bootstrap-transition.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-typeahead.js

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-01-13 04:26:52 -08:00