]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f587e81 59673bf)
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Sun, 15 Jan 2012 00:18:39 +0000 (16:18 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 15 Jan 2012 00:18:39 +0000 (16:18 -0800)
1  2 
docs/components.html patch | diff1 | diff2 | blob | history

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