Mark Otto 2aa1a4dc70 Merge branch 'master' into 3.0.0-wip ...

Conflicts:
	docs/assets/js/bootstrap.min.js

2013-02-07 22:18:53 -08:00

..

tests

unit tests

2013-02-06 06:20:05 -05:00

.jshintrc

…

bootstrap-affix.js

…

bootstrap-alert.js

…

bootstrap-button.js

…

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

Merge branch 'master' into 3.0.0-wip

2013-02-07 22:18:53 -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

…

bootstrap-tab.js

…

bootstrap-tooltip.js

Merge branch 'master' into 3.0.0-wip

2013-02-07 22:18:53 -08:00

bootstrap-transition.js

…

bootstrap-typeahead.js

Merge branch 'master' into 3.0.0-wip

2013-02-07 22:18:53 -08:00