• 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
Name
Last commit
Last update
dist Loading commit data...
docs Loading commit data...
fonts Loading commit data...
grunt Loading commit data...
js Loading commit data...
less Loading commit data...
test-infra Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.travis.yml Loading commit data...
CNAME Loading commit data...
CONTRIBUTING.md Loading commit data...
Gruntfile.js Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
_config.yml Loading commit data...
bower.json Loading commit data...
composer.json Loading commit data...
package.json Loading commit data...