]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Tue, 21 Feb 2012 16:25:19 +0000 (08:25 -0800)
committerMark Otto <markotto@twitter.com>
Tue, 21 Feb 2012 16:25:19 +0000 (08:25 -0800)
commit80abc50d3efd2123f23bb908e9a23e45548abcea
tree3ecc372b92214c85eb726fe4f746a15444c7938a
parentf3ad4c7183251713eb021a400211cc9b07577080
parentd149a131c14bb8be32ecc306f2128dddec9e83bf
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

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