]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
commitd7953a8f1e491d6ec5e479e26d15ae3b545fbb5f
tree8bc5e771a8b3dad44e16aedb7ac1827ca368d952
parented07a4d0ce0e769ef6efbd8d465670b26a0a5e37
parent2eedf60d6284f8eef256999d2a59dd18bcbd2b2a
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/javascript.html
docs/templates/pages/javascript.mustache