]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc58a65 034155e)
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl...
authorMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
committerMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less

1  2 
fluid.html patch | diff1 | diff2 | blob | history
hero.html patch | diff1 | diff2 | blob | history

diff --cc fluid.html
Simple merge
diff --cc hero.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git