• Mark Otto's avatar
    Merge branch 'master' into derp · 724240fe
    Mark Otto authored
    Conflicts:
    	dist/css/bootstrap.css.map
    	dist/css/bootstrap.min.css
    	docs/_includes/customizer-variables.html
    	docs/_includes/js/overview.html
    	docs/assets/js/customize.min.js
    	docs/assets/js/raw-files.min.js
    	docs/browser-bugs.html
    	docs/dist/css/bootstrap.css.map
    	docs/dist/css/bootstrap.min.css
    	less/carousel.less
    724240fe
This project manages its dependencies using npm. Learn more