]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7bc9e1 8a84da6)
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3...
authorMark Otto <otto@github.com>
Thu, 18 Jul 2013 07:43:48 +0000 (00:43 -0700)
committerMark Otto <otto@github.com>
Thu, 18 Jul 2013 07:43:48 +0000 (00:43 -0700)
1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
docs/javascript.html patch | diff1 | diff2 | blob | history

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