]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commitc414e57dccf0d0177f42df10d2f36f79581563d6
tree59b7fdd5f757789f8d4ea58456b6b450efb337b0
parent305374ab1a49a1bdfbab0e52a2be218fc42f3cc0
parent1562381114ce1ce5dc06d311ddb6d1e0f2048a1f
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip