]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98d1659 b96e80c)
Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master
authorMark Otto <markdotto@gmail.com>
Thu, 2 Feb 2012 07:12:06 +0000 (23:12 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 2 Feb 2012 07:12:06 +0000 (23:12 -0800)
1  2 
docs/scaffolding.html patch | diff1 | diff2 | blob | history
docs/templates/pages/scaffolding.mustache patch | diff1 | diff2 | blob | history

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