]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4aa1fc 0a8d834)
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)
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


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git