]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twitter/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 04:42:56 +0000 (21:42 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 04:42:56 +0000 (21:42 -0700)
commite11c49cc48a70de1728ed18ca425db74e79c9938
treebd23ebcb2e9f077024bb1b551fbba2e84e263c33
parentb54dc13535ce50d26f3814a0246aae769ff45fc8
parentf169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/assets/css/docs.css
docs/index.html
lib/forms.less