]> 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)
commit68475f87079124710e2f3c2eb96dbd6a45df16cd
treedc3403963aecc235e15bda14a21123fe26d34b38
parentcecabeadecf5f586f255dc7e6c8d7c4c43eca21b
parent0f9073c5cd88d362d5e9eb6541ec8ad25add6205
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