]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commitd9b35c2602b18c78a72ba4b1698b3ec93ccb868d
tree9ad02dd103c908c5c9008d2296623e896d4498f7
parentf068cdeb63770182b9e954eac9cbd11bf8df5d57
parent01b465928ec47d460ea1fd705e49aa2e0e9a4d28
Merge branch '2.3.0-wip' into 3.0.0-wip

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
14 files changed:
docs/assets/css/bootstrap.css
docs/base-css.html
docs/components.html
docs/css.html
docs/customize.html
docs/gallery.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/templates/layout.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/tests/css-tests.html
less/type.less