]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f6aeaa 001d5e0)
Merge branch 'master' into labels-readme
authorMark Otto <markdotto@gmail.com>
Wed, 12 Nov 2014 03:25:16 +0000 (19:25 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 12 Nov 2014 03:25:16 +0000 (19:25 -0800)
1  2 
README.md patch | diff1 | diff2 | blob | history

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