]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 3 Sep 2011 04:04:25 +0000 (21:04 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 3 Sep 2011 04:04:25 +0000 (21:04 -0700)
commit0e13f8dca10ff19397d577b0916a72129183bfeb
tree94840c00948c1b9844be7db18b8c1623100639bd
parentb4a84e1e7de1e5448cf9adc61a1a02badec80439
parent2589c0ac4ecc86feed81cfc5df344e0eb78cda64
Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
docs/assets/css/docs.css
lib/patterns.less
lib/preboot.less
lib/scaffolding.less