]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16d1239 532242e)
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 22:54:53 +0000 (14:54 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 22:54:53 +0000 (14:54 -0800)
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 fcf65621709fd66653dcd9950fbec8c6db2a05fb,2a4b693875007459cb1611c4ea8f0d204e641791..75ca96a3682868bd028b6cb92671c4440c797392
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git