]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa1b3bd 99e96f6)
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkingto...
authorMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:12:22 +0000 (17:12 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:12:22 +0000 (17:12 -0700)
Conflicts:
docs/assets/bootstrap.zip

1  2 
docs/assets/bootstrap.zip patch | diff1 | diff2 | blob | history
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history

diff --cc docs/assets/bootstrap.zip
index 693969290b7dda5a5f316d1647e7773669d1ca4a,7f099d78f910d37c7b22260785b235c7fef783fb..a7b69504173bfd68b12f38de86dd968432c1ef66
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git