bootstrap/docs/_includes/components
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
..
alerts.html Fix dismissible spelling 2014-06-18 00:00:28 +02:00
badges.html Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
breadcrumbs.html
button-dropdowns.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
button-groups.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
dropdowns.html remove deprecated warnings from docs 2014-07-09 13:51:20 -07:00
input-groups.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
jumbotron.html
labels.html fix grammar in new callout 2014-06-10 23:08:30 -07:00
list-group.html
media.html
navbar.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
navs.html Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
page-header.html
pagination.html
progress-bars.html Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
responsive-embed.html