]> 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>
Fri, 15 Feb 2013 07:44:50 +0000 (23:44 -0800)
committerMark Otto <otto@github.com>
Fri, 15 Feb 2013 07:44:50 +0000 (23:44 -0800)
commit87a317f42fbe6e1312937bc0cfa05a97f10a8096
treee08e269f728e6048f2164eaafdfc0fd4a43a575b
parent0765ea43dd7344b9485e5e3b43027ddd78cd34a8
parentb9291929bf58693f13f2cd48c9644e0e4febdc2d
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html