]> 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>
Thu, 12 Jan 2012 05:59:33 +0000 (21:59 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 12 Jan 2012 05:59:33 +0000 (21:59 -0800)
commit620d987f9f4a6e5d7bcf270159aea10e01d32a35
treeba4f28d0061aed2585591ed4455fd58169e2adfc
parent32c628725924ca014df208fa57de4c5a4050733e
parent19090ea33322e9d4309497f838f8627ca21734bf
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.css
bootstrap.min.css