]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into input_sizing 16159/head
authorMark Otto <markdotto@gmail.com>
Sun, 29 Mar 2015 03:31:53 +0000 (20:31 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 29 Mar 2015 03:31:53 +0000 (20:31 -0700)
commit57c8e3cd51abcb4230d37863b40bcca564d033f4
tree32ccb26c5f92cd96d9d569e9db277b2990ce04e3
parentdf8010b815b8cc4d2f5854b9ec05ca05143be29e
parent93bf800e1f00861525688007ae7aaf6f3daeda47
Merge branch 'master' into input_sizing

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css