• Mark Otto's avatar
    Merge branch '2.3.0-wip' into 3.0.0-wip · 421f9f67
    Mark Otto authored
    Conflicts:
    	docs/assets/css/bootstrap-responsive.css
    	docs/assets/js/bootstrap-popover.js
    	docs/assets/js/bootstrap.js
    	docs/css.html
    	docs/templates/pages/base-css.mustache
    	js/bootstrap-popover.js
    	less/mixins.less
    	less/tooltip.less
    421f9f67