]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 19:27:29 +0000 (11:27 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 19:27:29 +0000 (11:27 -0800)
commite24bd40b4a38b190caad2da9b90c683167c76004
treec7305cf363c71186eb40173f433306b1ac2fc7a6
parentb8511568637dfa4decb3f0475436a3dfa637a57d
parent25519bacd56ee2507cdde727d85458e5e5ef7949
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.css
docs/base-css.html