Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css

fix assets links in all examples

New Year

Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state

Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html

Bring back the `/docs` directory

Update dependencies (again)

Fixed typo

mv sauce_browsers.yml out of the project root

Merge two fs variable declarations into one

Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles

Conflicts:
	js/dropdown.js

Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

Conflicts:
	dist/js/bootstrap.min.js

Scrollspy acting up when targets are hidden