]> 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>
Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)
commit0de951f4f41c798dead8525e78153fc6c5da1479
tree4bd75bf2531609e23d743416a9bee7ac7338769c
parentfae04c8ac1da675338c1cfaf3922223980667281
parent2ba1b01f8d9a0410d9cf45532d8924d858af74cd
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

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