bootstrap/docs/_includes
Mark Otto dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
..
components Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
css Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
getting-started Drop the deprecated .visible-* classes (because we replaced them with .visible-*-block, -inline-block, -inline 2014-07-09 13:58:27 -07:00
js Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
nav Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
ads.html
customizer-variables.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
footer.html
header.html Nuke IE8 stuff from docs 2014-07-09 02:41:57 -07:00
social-buttons.html