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
badges.md	Merge branch 'master' into derp	2014-09-17 15:21:31 -07:00
breadcrumb.md	Rewrite breadcrumb in markdown	2014-07-12 01:03:13 -07:00
button-dropdown.md	Merge branch 'master' into v4	2014-11-30 20:17:45 -08:00
button-group.md	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
card.md	Fix @mdo's grammar	2014-12-30 12:45:24 -08:00
custom-forms.md	add indeterminate checkbox support	2015-01-01 12:01:55 -08:00
dropdowns.md	Merge branch 'master' into derp	2014-09-17 15:21:31 -07:00
forms.md	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
helpers.md	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
images.md	grunt dist	2015-01-05 11:41:34 -08:00
input-group.md	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
jumbotron.md	tweak and improve jumbotrons	2014-12-31 10:20:12 -08:00
label.md	remove docs warning on inline vs inline-block for labels	2014-12-06 00:30:28 -08:00
list-group.md	markdownify list group	2014-07-13 01:12:06 -07:00
navbar.md	Merge branch 'master' into v4	2014-11-30 20:17:45 -08:00
navs.md	Merge branch 'master' into v4	2014-11-30 20:17:45 -08:00
page-header.md	example page header	2014-07-14 09:14:31 -07:00
pagination.md	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
progress.md	Remove docs notes about old Firefoxes	2014-12-16 19:32:26 -08:00
responsive-embed.md	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00