• Mark Otto's avatar
    Merge branch 'master' into derp · 5cfde0d3
    Mark Otto authored
    Conflicts:
    	dist/css/bootstrap-theme.css.map
    	dist/css/bootstrap.css
    	dist/css/bootstrap.css.map
    	dist/css/bootstrap.min.css
    	docs/assets/js/customize.min.js
    	docs/dist/css/bootstrap-theme.css.map
    	docs/dist/css/bootstrap.css
    	docs/dist/css/bootstrap.css.map
    	docs/dist/css/bootstrap.min.css
    	docs/javascript/dropdowns.md
    	less/utilities.less
    5cfde0d3
forms.less 13.3 KB