• Mark Otto's avatar
    Merge branch 'master' into icon_paths · 31956be6
    Mark Otto authored
    Conflicts:
    	dist/css/bootstrap-rtl.css
    	dist/css/bootstrap.css.map
    	dist/js/bootstrap.min.js
    	docs/dist/css/bootstrap.css.map
    	docs/dist/js/bootstrap.min.js
    31956be6
bootstrap.css.map 212 KB