1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
twbs--bootstrap/js
Mark Otto 325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.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.css.map
	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/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
..
tests Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
.jscsrc Update JSCS config for the new version. 2015-01-16 17:49:58 +02:00
.jshintrc Revert UMD (#13772 & friends) for now, due to #13812. 2014-06-23 11:11:59 -07:00
affix.js bump versions 2015-01-19 08:32:13 -08:00
alert.js bump versions 2015-01-19 08:32:13 -08:00
button.js bump versions 2015-01-19 08:32:13 -08:00
carousel.js Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
collapse.js bump versions 2015-01-19 08:32:13 -08:00
dropdown.js bump versions 2015-01-19 08:32:13 -08:00
modal.js bump versions 2015-01-19 08:32:13 -08:00
popover.js Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
scrollspy.js bump versions 2015-01-19 08:32:13 -08:00
tab.js bump versions 2015-01-19 08:32:13 -08:00
tooltip.js Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
transition.js bump versions 2015-01-19 08:32:13 -08:00