Mark Otto 58082cd83e Merge branch 'master' into v4 ... Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/migration.html js/affix.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss		2015-03-29 00:08:54 -07:00
..
externs	bootstrap onto closure	2015-02-11 11:29:43 -08:00
tests	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
.jscsrc	JSCS: Add "disallowSpacesInFunctionDeclaration"	2015-03-26 18:28:17 +01:00
.jshintrc	Revert UMD (#13772 & friends) for now, due to #13812.	2014-06-23 11:11:59 -07:00
alert.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
button.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
carousel.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
collapse.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
dropdown.js	Fix #16072: Clicking into input field within dropdown no longer closes the dropdown	2015-03-21 16:00:15 -07:00
modal.js	rm redundant aria-hidden usage from Modals; fixes #16020	2015-03-25 18:06:47 -07:00
popover.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
scrollspy.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
tab.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
tooltip.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
transition.js	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
util.js	bootstrap onto closure	2015-02-11 11:29:43 -08:00