]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72a5363 7df0d1c)
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Tue, 20 Dec 2011 06:59:20 +0000 (22:59 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 20 Dec 2011 06:59:20 +0000 (22:59 -0800)
1  2 
docs/assets/css/docs.css patch | diff1 | diff2 | blob | history
docs/javascript.html patch | diff1 | diff2 | blob | history

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