0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Bootstrap/docs/javascript
Mark Otto 86af1f39ab Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	_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
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	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/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less
2014-11-09 22:02:53 -08:00
..
affix.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
alerts.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
buttons.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
carousel.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
collapse.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
dropdowns.md Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
modal.md Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
overview.md Merge branch 'master' into derp 2014-08-04 15:09:23 -07:00
popovers.md Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
scrollspy.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
tabs.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
tooltips.md Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
transitions.md markdownify js transitions 2014-07-12 02:34:15 -07:00