]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e2348e 225819a)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 7 Jul 2014 06:45:36 +0000 (23:45 -0700)
committerMark Otto <otto@github.com>
Mon, 7 Jul 2014 06:45:36 +0000 (23:45 -0700)
1  2 
dist/css/bootstrap.css patch | diff1 | diff2 | blob | history
docs/dist/css/bootstrap.css patch | diff1 | diff2 | blob | history

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