]> 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 22:12:29 +0000 (14:12 -0800)
committerMark Otto <markotto@twitter.com>
Sat, 10 Mar 2012 22:12:29 +0000 (14:12 -0800)
commitf7d4fb61ce1c1f2acde74d779adbc91d137e157c
tree8edcd9695e0119dd13cea068b064d5f4db2a4b13
parentdd5cffc308f9c990ed40be074c864d0ed563ef12
parenta07851d6afdd51ded9273083ec5c734b0af52ddb
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
docs/assets/css/bootstrap.css