diff options
| author | Mark Otto <[email protected]> | 2013-01-17 20:23:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-17 20:23:33 -0800 |
| commit | 68475f87079124710e2f3c2eb96dbd6a45df16cd (patch) | |
| tree | dc3403963aecc235e15bda14a21123fe26d34b38 /assets | |
| parent | cecabeadecf5f586f255dc7e6c8d7c4c43eca21b (diff) | |
| parent | 0f9073c5cd88d362d5e9eb6541ec8ad25add6205 (diff) | |
| download | bootstrap-68475f87079124710e2f3c2eb96dbd6a45df16cd.tar.xz bootstrap-68475f87079124710e2f3c2eb96dbd6a45df16cd.zip | |
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
Diffstat (limited to 'assets')
0 files changed, 0 insertions, 0 deletions