]> 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, 5 Jan 2012 09:37:06 +0000 (01:37 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 5 Jan 2012 09:37:06 +0000 (01:37 -0800)
commitbdc22e71c8cbeddb1dbee9708ab68b4f23abb6f4
tree8fe71ef93378fdc85c862cec7a7490ef0391cd2d
parenta13ab64870f40a67ffd85532c30620f8001d0822
parent5661855be3da81f0a46bd99c7522a93f01706289
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

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