]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.2.2-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)
committerMark Otto <otto@github.com>
Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)
commitcb67366206b318c183b00f6bc6f30652518147b8
treec82c6333920b06b6875c0691ed2462840281cdfb
parent145ed23ac5d1c50e76727889cc54948bf80058d2
parent5cf2e8a1cbd86a2c3c4d3683c2ffda248eb27355
Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less