]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Sun, 21 Jul 2013 15:52:25 +0000 (08:52 -0700)
committerMark Otto <otto@github.com>
Sun, 21 Jul 2013 15:52:25 +0000 (08:52 -0700)
commit12468c61037469985e0cc1669966d63208becc75
treeb286e5447c8195e91eee96caa007295c088f4988
parenta63db4d2f91c056310fc9a24891dbd161672451b
parent582e9986a865dbf7e0bf1aca2dbec19cb3218506
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css
css.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css