]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fae04c8 2ba1b01)
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)
Conflicts:
docs/assets/bootstrap.zip

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

diff --cc docs/assets/bootstrap.zip
index dafd812dc75964e3419b8c57890d78ae8057dbbc,cb200386a733e39d239b41a1f123396fb41b9616..6eb49b183e0dc9869df48d68bd1e753969436ac3
Binary files differ
Mirror of https://github.com/twbs/bootstrap.git