]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 044b094 597d9e8)
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0...
authorMark Otto <otto@github.com>
Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)
committerMark Otto <otto@github.com>
Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)
Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html


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