]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c23ba4d 5588e14)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 26 Jul 2013 07:04:24 +0000 (00:04 -0700)
committerMark Otto <otto@github.com>
Fri, 26 Jul 2013 07:04:24 +0000 (00:04 -0700)
1  2 
assets/css/docs.css patch | diff1 | diff2 | blob | history
assets/js/application.js patch | diff1 | diff2 | blob | history

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