]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3...
authorMark Otto <otto@github.com>
Thu, 20 Dec 2012 07:18:02 +0000 (23:18 -0800)
committerMark Otto <otto@github.com>
Thu, 20 Dec 2012 07:18:02 +0000 (23:18 -0800)
commit09dde5c84ab890404703c95f704978f5cf88fa2b
treef35ccc0da18b0b56230bd711f620aae1bc8b3592
parenta27952efd0f25e99030a9384f66bcd602d6a1b37
parent8c8a14ab59553984d6bb2b1d080e9f3917d6e981
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
docs/assets/css/bootstrap.css
docs/css.html
docs/templates/pages/css.mustache
less/buttons.less
less/forms.less
less/mixins.less