• Mark Otto's avatar
    Merge branch 'master' into derp · dae1a68f
    Mark Otto authored
    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
    dae1a68f