• Mark Otto's avatar
    Merge branch '2.3.0-wip' into 3.0.0-wip · 43da258b
    Mark Otto authored
    Conflicts:
    	docs/assets/css/bootstrap-responsive.css
    	docs/assets/css/bootstrap.css
    	docs/examples/hero.html
    	less/buttons.less
    	less/carousel.less
    	less/close.less
    	less/dropdowns.less
    	less/labels-badges.less
    	less/mixins.less
    	less/navbar.less
    	less/navs.less
    	less/pagination.less
    	less/responsive-navbar.less
    	less/scaffolding.less
    	less/sprites.less
    	less/thumbnails.less
    	less/type.less
    43da258b