Mark Otto c16fee5efd Merge branch 'master' into v4 ... Conflicts: .travis.yml Gruntfile.js bower.json dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_data/glyphicons.yml docs/_includes/components/breadcrumbs.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/license.html docs/_includes/getting-started/template.html docs/_includes/header.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.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/assets/js/vendor/FileSaver.js docs/assets/js/vendor/autoprefixer.js docs/assets/js/vendor/uglify.min.js docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.min.js docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/narrow-jumbotron/narrow-jumbotron.css docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/theme/index.html grunt/configBridge.json js/affix.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tooltip.js less/badges.less less/glyphicons.less less/type.less less/variables.less package.json scss/_dropdown.scss scss/_forms.scss test-infra/npm-shrinkwrap.json		2015-03-01 13:44:10 -08:00
..
album	Fix @mdo's grammar	2014-12-30 12:45:24 -08:00
blog	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
carousel	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
cover	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
dashboard	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
grid	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
jumbotron	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
justified-nav	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
narrow-jumbotron	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
navbar	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
navbar-top	Fix @mdo's grammar	2014-12-30 12:45:24 -08:00
navbar-top-fixed	clean up navbar examples	2014-11-29 15:07:13 -08:00
offcanvas	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
screenshots	Example: minor image compression improvements.	2014-11-30 13:16:27 +02:00
signin	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
starter-template	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
sticky-footer	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
sticky-footer-navbar	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
tooltip-viewport	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
overview.md	move examples index again, clean up nav	2014-12-01 16:51:31 -08:00