]> 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 18:49:41 +0000 (11:49 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 2 Sep 2011 18:49:41 +0000 (11:49 -0700)
commitdb43777ddf2a72146621f385f54cba0d4103f80d
treef6dc34a1873c0f66904ac92927ec1ef0b70d6330
parent3f242bc70cde589d41dd7574e273e29511c317d2
parenta4dc2c8955e0db79cc800f38d949db0ba0e7ba9a
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css