]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e5a2fe cf852c1)
Merge branch 'wilfra-patch-2' into 2.3.0-wip
authorMark Otto <otto@github.com>
Fri, 11 Jan 2013 18:58:17 +0000 (10:58 -0800)
committerMark Otto <otto@github.com>
Fri, 11 Jan 2013 18:58:17 +0000 (10:58 -0800)
1  2 
docs/examples/carousel.html patch | diff1 | diff2 | blob | history
docs/examples/justified-nav.html patch | diff1 | diff2 | blob | history

diff --cc docs/examples/carousel.html
Simple merge
diff --cc docs/examples/justified-nav.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git