]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 00:42:37 +0000 (16:42 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 00:42:37 +0000 (16:42 -0800)
Conflicts:
docs/assets/bootstrap.zip

1  2 
docs/assets/bootstrap.zip

index bd974a462514d6effcf531941a008e6d2bd5a3f0,dbceeaa25513fb8fc9f429f74e984ca836200ee3..7a18bce0deb9a4ed6b7a668c379585545af11df5
Binary files differ