Mark Otto dae1a68fb1 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

2014-07-09 22:19:23 -07:00

..

index.html

Merge branch 'master' into derp

2014-07-09 22:19:23 -07:00

theme.css

fix nested containers (addresses some of #13682)

2014-06-08 13:28:45 -07:00