]> 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>
Fri, 27 Jan 2012 21:21:01 +0000 (13:21 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 27 Jan 2012 21:21:01 +0000 (13:21 -0800)
commitccd963e622bdcadc8a79f5b8c1bb770b09f63f20
tree64c97dbd98648791b2eb04682e25dcc6610f5aa4
parente8647c1b118d2c726a8987e9a41aad82da972b57
parent3b3dbd7229f53eb71759def4eca90dfd7a2699f8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
docs/assets/css/bootstrap.css
docs/javascript.html