]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb29075 4d6434a)
Merge branch 'philfreo-patch-1' into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Fri, 6 Jul 2012 17:22:53 +0000 (10:22 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 6 Jul 2012 17:22:53 +0000 (10:22 -0700)
1  2 
README.md patch | diff1 | diff2 | blob | history

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