]> 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>
Sun, 8 Jan 2012 08:50:48 +0000 (00:50 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 8 Jan 2012 08:50:48 +0000 (00:50 -0800)
commitbc505560a05cd867ea8dbfbcefe2217223d58316
tree2a2948c3b8b606cf5707ab7a37199d18b114c435
parent4478df768168fe41599508688046612bf5f1e526
parent3c2f82f469be4792e85eb73fd1e3b882dcadd48d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.min.css
bootstrap.css