twbs--bootstrap/docs
Mark Otto b648a77ed3 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.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/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.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/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.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/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.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/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	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/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less
2014-11-30 20:17:45 -08:00
..
_data Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
_includes Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
_jade .bs-customizer-input => .col-xs-4 2014-10-27 15:02:21 -07:00
_layouts Use Jekyll data for Wall of Browser Bugs 2014-11-04 07:25:52 +01:00
_plugins Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
about Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
assets Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
components Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
dist Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
examples Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
getting-started Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
javascript Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
layout Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
LICENSE Rename docs/LICENSE-DOCS to docs/LICENSE 2014-01-14 13:47:18 +01: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
customize.html Merge branch 'master' into v4 2014-11-30 20:17:45 -08:00
favicon.ico Fix favicon.ico after d763b0fe5b. 2014-06-09 11:13:24 +03:00
index.html hide sections of homepage and quick start 2014-11-25 17:40:08 -08:00
robots.txt Remove `layout: nil`. 2014-08-01 19:45:11 +03:00
sitemap.xml Added/removed blank lines in the docs for consitency 2014-10-22 13:52:49 +02:00