Mark Otto d6b0f45fb7 Merge branch 'master' into derp ... 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 docs/_includes/components/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.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/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/getting-started.html 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/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/components.html docs/components/navbar.md docs/css.html 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/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/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/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less		2014-10-26 22:31:59 -07:00
..
_data	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_includes	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_jade	Fix anchor link	2014-09-26 08:27:55 -07:00
_layouts	add role="button" to a couple more dummy-anchor btns	2014-10-20 20:16:09 -07:00
_plugins	plugins: add new example doodad hackery bullshitery and markdown block plugin for markdown includes	2014-07-09 20:00:22 -07:00
about	move license and translations to about section	2014-08-05 17:19:12 -07:00
assets	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
components	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
dist	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
examples	Merge pull request #14857 from twbs/fix-14856	2014-10-24 12:09:44 -07:00
getting-started	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
javascript	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
layout	Merge branch 'master' into derp	2014-10-26 22:31:59 -07: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-10-26 22:31:59 -07:00
customize.html	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
favicon.ico	Fix favicon.ico after d763b0fe5b.	2014-06-09 11:13:24 +03:00
index.html	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
LICENSE	Rename docs/LICENSE-DOCS to docs/LICENSE	2014-01-14 13:47:18 +01: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