]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 775c29f 94a5413)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sat, 7 Dec 2013 19:41:02 +0000 (11:41 -0800)
committerMark Otto <otto@github.com>
Sat, 7 Dec 2013 19:41:02 +0000 (11:41 -0800)
1  2 
about.html patch | diff1 | diff2 | blob | history

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