]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 10 Sep 2011 05:48:57 +0000 (22:48 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 10 Sep 2011 05:48:57 +0000 (22:48 -0700)
commit79d5f907130a030963b802647e3ed3bcb6300a46
tree3d35f144b2e513696547578e40719e4f46920841
parent5f4e30ed1d33f83b0fad3afc9174e193e6c3fdf4
parent0b43bc9bb9266fa8e8d830b82ede20fb3a939acd
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
bootstrap-1.3.0.css
bootstrap-1.3.0.css
docs/index.html