]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
authorfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:28:17 +0000 (21:28 -0700)
committerfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:28:17 +0000 (21:28 -0700)
commit31c1eba51bf3f5a988e7bef9da88372e673c30c2
treef36c63804b743cf55e2f61ba55827e16c4ae8597
parent92e7f166e7b65259cffcf20a27984bc365dd8b48
parent41ad16fe406956cc8604b295ae0b5f185386c595
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip

Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
Makefile