]> 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:43:28 +0000 (13:43 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 27 Jan 2012 21:43:28 +0000 (13:43 -0800)
commit335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff
tree28c02ec1c706795bb1afbf9b5c55049485a41b83
parentb1f38bbea85c313f1a9512c821de1255e2a0d537
parent3c7e3eb7d37507ba12d95024f06d6f872a44eecd
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

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