]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'misc_css_fixes'
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 04:42:10 +0000 (21:42 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 04:42:10 +0000 (21:42 -0700)
commitb54dc13535ce50d26f3814a0246aae769ff45fc8
treef55f48da03677560ff21d245c24dccfed134df0d
parent14b77f3a2164a5348ec8d9841ddc3ace27a64e37
parent985ee6455a0ee86153cb8bca29f5fbf7b5dbfcf6
Merge branch 'misc_css_fixes'

Conflicts:
bootstrap-1.0.0.css
lib/patterns.less
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
lib/patterns.less
lib/preboot.less