]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflicts
authorMark Otto <mark.otto@twitter.com>
Mon, 22 Aug 2011 03:51:13 +0000 (20:51 -0700)
committerMark Otto <mark.otto@twitter.com>
Mon, 22 Aug 2011 03:51:13 +0000 (20:51 -0700)
commit23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22
treee5e5f2ac156351d93f007fd9b399c0a6a6c01b5a
parentb59b82b032b2ef868e113b40014f36ff0d22adcd
parenta98d2cccb8076b106e08e7ca76e59af013ab2851
resolve conflicts
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
lib/forms.less