]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11388
authorMark Otto <otto@github.com>
Sat, 30 Nov 2013 08:26:53 +0000 (00:26 -0800)
committerMark Otto <otto@github.com>
Sat, 30 Nov 2013 08:26:53 +0000 (00:26 -0800)
commitbb4a39d51cd644b212323a7e36f0b5af2682d0ca
tree60ae6687f516cea501f32f5623a5c0aacb950772
parent96109d3138fd6f5b67fb1108754e81c077630b36
parente6eb798178529cf58fab3f33446c0170bae7bdea
Merge branch 'master' into pr/11388

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
less/mixins.less