]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 22 Mar 2012 04:37:17 +0000 (21:37 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 22 Mar 2012 04:37:17 +0000 (21:37 -0700)
commit22963d73467a604b845dbebc03c9b8fa16ba2e23
treec1acb59e4e756d2179081d0c8a4de6b2bc3715bf
parentd5fb653914617d63739142f6ecef00afd4d3c796
parentcb8dcfcebfbbd8f2ea26b786b44992f00d35ac30
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip