]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4376ce8 00850e2)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 23 Dec 2013 21:26:01 +0000 (13:26 -0800)
committerMark Otto <otto@github.com>
Mon, 23 Dec 2013 21:26:01 +0000 (13:26 -0800)
1  2 
dist/css/bootstrap-theme.css patch | diff1 | diff2 | blob | history
dist/css/bootstrap.css patch | diff1 | diff2 | blob | history

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