]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92a54a7 f3b6cf1)
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Wed, 22 Feb 2012 16:12:51 +0000 (08:12 -0800)
committerMark Otto <markotto@twitter.com>
Wed, 22 Feb 2012 16:12:51 +0000 (08:12 -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 bbb57eadbb4d2814024b1353a268d31c4f8b7f4f,142b61377563611b0ea22e9fa6f9bcca33a28aa2..2a5e598c1744b0eabe33bfeed84b402e55a74af2
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git