]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebe547b 5b4a29d)
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
authorMark Otto <markotto@twitter.com>
Sun, 12 Feb 2012 21:27:29 +0000 (13:27 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 12 Feb 2012 21:27:29 +0000 (13:27 -0800)
Conflicts:
docs/assets/bootstrap.zip

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

diff --cc docs/assets/bootstrap.zip
index 28407b9a3d7647936a3a6088de1fc8e779166970,073df93f0a1178b1447d9048ffb2b4baeea4d745..89446db2c2d1d02d0e4fb4d6e2793663d6ac73e1
Binary files differ
diff --cc docs/javascript.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git