]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 1 Dec 2011 06:05:49 +0000 (22:05 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 1 Dec 2011 06:05:49 +0000 (22:05 -0800)
commitb1cba98aab5ee2d0576bbbbb92ba3488516290eb
treecb938e0ba8f666ffbd8e6436b8e3b4fb1490adc4
parentdc628c9115b74e49940c0cc200a8914232c9d2a2
parentbc51c15709469fd0c2e78886a15e849626a8f191
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.css