]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 22:47:29 +0000 (15:47 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 22:47:29 +0000 (15:47 -0700)
commitc240460f0b38ab2a2bc4f542695a4ca4e1748487
tree35641cecac7a46779c1c996ffcc5048a14700740
parentfa7cc6cafda4f5a9363d17507bf91cba22777749
parent638db635d7b0c2bd6406d5ff891e92985e4b839b
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes

Conflicts:
dist/css/bootstrap.min.css
components.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css