Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip ...

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less

2012-12-05 11:05:10 -08:00

..

tests

Merge pull request #5309 from erlendfh/dropdown-bugfix

2012-10-17 23:00:41 -07:00

.jshintrc

some progress on affix plugin

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

bootstrap-affix.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-alert.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-button.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-carousel.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-collapse.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-dropdown.js

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

bootstrap-modal.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-popover.js

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

bootstrap-scrollspy.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-tab.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-tooltip.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-transition.js

version bump to 3.0

2012-11-30 22:30:50 -08:00

bootstrap-typeahead.js

version bump to 3.0

2012-11-30 22:30:50 -08:00