]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into...
authorMark Otto <markotto@twitter.com>
Tue, 21 Feb 2012 17:05:04 +0000 (09:05 -0800)
committerMark Otto <markotto@twitter.com>
Tue, 21 Feb 2012 17:05:04 +0000 (09:05 -0800)
commitd908731566a18a236609708238e697b4fc3c1355
tree406f0f0a89c1aaee9ed57b9ccc91128d6f17bbf2
parent187b3bd4bd891295213a8b131cdf8e5e4d210286
parentdfd03261863b2ccd98cc8ea746e9d5e515ac0b6e
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix

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