]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0765ea4 b929192)
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)
Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git