]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Sat, 10 Mar 2012 19:23:47 +0000 (11:23 -0800)
committerMark Otto <markotto@twitter.com>
Sat, 10 Mar 2012 19:23:47 +0000 (11:23 -0800)
Conflicts:
docs/assets/bootstrap.zip

1  2 
docs/assets/bootstrap.zip

index b317f29364a4203401a39ff80770a7476ce47220,29fa6ab4c3e0fde3042e7e40e4ee9965414e01b6..b87f61992925b937c240d90711b88aeac94364dc
Binary files differ