0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Bootstrap/docs/javascript
Mark Otto 724240fe4f Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
2014-08-04 15:09:23 -07:00
..
affix.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
alerts.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
buttons.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
carousel.md markdownify js carousel 2014-07-13 00:54:14 -07:00
collapse.md markdownify js collapse 2014-07-13 00:54:21 -07:00
dropdowns.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
modal.md markdownify js modal 2014-07-13 00:54:29 -07:00
overview.md Merge branch 'master' into derp 2014-08-04 15:09:23 -07:00
popovers.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
scrollspy.md markdownify scrollspy 2014-07-12 02:42:19 -07:00
tabs.md markdownify tabs 2014-07-12 02:42:23 -07:00
tooltips.md Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
transitions.md markdownify js transitions 2014-07-12 02:34:15 -07:00