]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
authorMark Otto <otto@github.com>
Tue, 13 Aug 2013 04:34:55 +0000 (21:34 -0700)
committerMark Otto <otto@github.com>
Tue, 13 Aug 2013 04:34:55 +0000 (21:34 -0700)
commit80eb09cc1b1db0e7899039f67adf78f0b14ac9a5
tree7bbfd5e26396c20bd0fecfc5f6aa17eb0a51d019
parent8bb7def26cac4d3166fbf2cc98f16c4151794676
parent49576704ea6c24fbc4cb32f44c5986a1e7714634
Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Conflicts:
components.html
dist/css/bootstrap.min.css
assets/css/docs.css
components.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css