]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4aba489 8d5a937)
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Sun, 17 Mar 2013 18:45:21 +0000 (11:45 -0700)
committerMark Otto <otto@github.com>
Sun, 17 Mar 2013 18:45:21 +0000 (11:45 -0700)
1  2 
README.md patch | diff1 | diff2 | blob | history

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