0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Bootstrap/docs/javascript
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
..
alerts.md Merge branch 'master' into v4 2015-01-03 20:08:58 -08:00
buttons.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
carousel.md remove lingering reference to IE8 in the Carousel docs 2014-12-30 16:15:02 -08:00
collapse.md Merge branch 'master' into v4 2014-12-01 01:41:10 -08:00
dropdowns.md Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
modal.md Merge branch 'master' into v4 2015-01-03 20:08:58 -08:00
overview.md Merge branch 'master' into v4 2015-01-03 20:08:58 -08:00
popovers.md Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
scrollspy.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
tabs.md fixes and grunt 2014-11-30 21:01:50 -08:00
tooltips.md Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
transitions.md markdownify js transitions 2014-07-12 02:34:15 -07:00