• Mark Otto's avatar
    Merge branch '2.1.2-wip' into exploratory · 4ab7b77a
    Mark Otto authored
    Conflicts:
    	docs/assets/css/bootstrap-responsive.css
    	docs/assets/css/bootstrap.css
    	docs/components.html
    	docs/templates/pages/components.mustache
    	less/labels-badges.less
    	less/navbar.less
    	less/tables.less
    4ab7b77a
javascript.mustache 87.1 KB