mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-04 16:24:22 +01:00
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
This commit is contained in:
commit
87a317f42f