]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfa5ce7 cf23dc4)
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
authorMark Otto <mark.otto@twitter.com>
Sat, 3 Sep 2011 06:35:44 +0000 (23:35 -0700)
committerMark Otto <mark.otto@twitter.com>
Sat, 3 Sep 2011 06:35:44 +0000 (23:35 -0700)
1  2 
docs/index.html patch | diff1 | diff2 | blob | history

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