Arnold Daniels 176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip ...

Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json

2012-11-29 23:58:46 +01:00

..

tests

Merge pull request #5309 from erlendfh/dropdown-bugfix

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

.jshintrc

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

bootstrap-affix.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-alert.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-button.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-carousel.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-collapse.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-dropdown.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-fileupload.js

Check if target is dismiss or trigged in fileupload data-api click handler.

2012-11-16 10:34:55 +01:00

bootstrap-inputmask.js

Cast option.mask to string. Fixed issue #12

2012-10-12 02:14:18 +02:00

bootstrap-modal.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-popover.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-rowlink.js

Documented Row link js

2012-09-05 11:46:17 +02:00

bootstrap-scrollspy.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-tab.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-tooltip.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-transition.js

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap-typeahead.js

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

bootstrap.js

Added bootstrap.js in source

2012-11-16 10:34:55 +01:00