]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.3.0-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:53:44 +0000 (19:53 -0800)
committerMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:53:44 +0000 (19:53 -0800)
commit43da258bd9e67e0aaa850bd92c95937f7d586796
tree21dd1a45f52eba75b11a0dd6770d9d3aed28e685
parente4a74607b02f81e8007ac9903da1e6eddd8a5692
parentc97d304c0ca0c3b11f2c550590b54a75b41471fb
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
15 files changed:
docs/assets/css/bootstrap.css
less/buttons.less
less/carousel.less
less/close.less
less/counters.less
less/dropdowns.less
less/mixins.less
less/navbar.less
less/navs.less
less/pager.less
less/pagination.less
less/scaffolding.less
less/thumbnails.less
less/type.less
package.json