Mark Otto 0e5d17d5f6 Merge branch 'master' into v4 ... Conflicts: Gruntfile.js 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/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html 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/input-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/page-header.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/code.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/whats-included.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/javascript.html docs/_jade/customizer-variables.jade docs/_layouts/default.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/customize.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css less/glyphicons.less less/mixins/vendor-prefixes.less less/navbar.less less/popovers.less less/tables.less less/theme.less less/tooltip.less less/variables.less package.json scss/_carousel.scss scss/_close.scss scss/_forms.scss test-infra/npm-shrinkwrap.json		2015-01-03 20:08:58 -08:00
..
_data	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_includes	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_layouts	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_plugins	Add support for example IDs to {% example %} template tag	2014-12-02 18:46:42 -08:00
about	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
assets	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
components	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
content	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
dist	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
examples	Fix @mdo's grammar	2014-12-30 12:45:24 -08:00
extend	stub out extend section a bit	2014-12-06 00:18:44 -08:00
getting-started	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
javascript	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
layout	change values, remove grid column size row	2014-12-31 10:46:50 -08:00
apple-touch-icon.png	Losslessly compress apple-touch-icon.png.	2014-10-26 08:08:33 +02:00
browser-bugs.md	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
favicon.ico	Fix favicon.ico after d763b0fe5b.	2014-06-09 11:13:24 +03:00
index.html	remove lingering references to Less in the docs	2014-12-30 16:14:32 -08:00
LICENSE	Rename docs/LICENSE-DOCS to docs/LICENSE	2014-01-14 13:47:18 +01:00
migration.md	make some notes for myself	2014-12-23 03:57:55 -08:00
robots.txt	Remove layout: nil.	2014-08-01 19:45:11 +03:00
search.json	basic docs search	2014-12-24 02:44:38 -08:00
sitemap.xml	Added/removed blank lines in the docs for consitency	2014-10-22 13:52:49 +02:00