]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f09028 e27ae9c)
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Fri, 13 Jan 2012 17:55:43 +0000 (09:55 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 13 Jan 2012 17:55:43 +0000 (09:55 -0800)
1  2 
docs/less.html patch | diff1 | diff2 | blob | history
docs/scaffolding.html patch | diff1 | diff2 | blob | history
docs/upgrading.html patch | diff1 | diff2 | blob | history

diff --cc docs/less.html
Simple merge
diff --cc docs/scaffolding.html
Simple merge
diff --cc docs/upgrading.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git