]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cecabea 0f9073c)
Merge branch '2.3.0-wip' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 18 Jan 2013 04:23:33 +0000 (20:23 -0800)
committerMark Otto <otto@github.com>
Fri, 18 Jan 2013 04:23:33 +0000 (20:23 -0800)
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less


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