]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 2 Sep 2011 05:54:59 +0000 (22:54 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 2 Sep 2011 05:54:59 +0000 (22:54 -0700)
commit0159524413f7a90b90cff50fa07d07b85380845d
treea05a627878a00e467dc4acfdef164ff89179aeef
parent72da5dd54d154bb2b87b0ec23107eca775c72f51
parent0cb6804b6953d8fce53fcfae065288fd826d1941
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
docs/index.html