]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fac2c0 8b136f5)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Mon, 10 Jun 2013 06:45:23 +0000 (23:45 -0700)
committerMark Otto <otto@github.com>
Mon, 10 Jun 2013 06:45:23 +0000 (23:45 -0700)
1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
docs/css.html patch | diff1 | diff2 | blob | history

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