]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 390a9af aec0cb3)
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:08 +0000 (13:59 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:08 +0000 (13:59 -0800)
Conflicts:
docs/assets/bootstrap.zip

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

diff --cc docs/assets/bootstrap.zip
index 9fa9c1f60562be2726a866bce5e10865dd0a275a,554bd04e4af88eaea76a0a1fdd2da73c7e758135..3058e4ff88a73eb315489656f0cecb3e882bf68c
Binary files differ
diff --cc docs/less.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git