diff options
| author | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
| commit | 74521e835489066d58813c960bc98d1713ea6074 (patch) | |
| tree | 487e40dd09ab1120130dc64b4292eb3e57f0eec2 /docs/index.html | |
| parent | f764aee4b919c28974dba7b91edac9a04172ba25 (diff) | |
| parent | a074087034716804610637a5ad9cc0447a2cccb2 (diff) | |
| download | bootstrap-74521e835489066d58813c960bc98d1713ea6074.tar.xz bootstrap-74521e835489066d58813c960bc98d1713ea6074.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docs/index.html b/docs/index.html index 1e0ff52f6..f61518e07 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,6 +35,7 @@ <a class="brand" href="./index.html">Bootstrap</a> <ul class="nav"> <li class="active"><a href="./index.html">Overview</a></li> +<<<<<<< HEAD <li class="dropdown "> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> Scaffolding @@ -100,6 +101,22 @@ <a href="./less.html"> Using LESS </a> +======= + <li> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li> + <a href="./base-css.html">Base CSS</a> + </li> + <li> + <a href="./components.html">Components</a> + </li> + <li> + <a href="./javascript.html">Javascript plugins</a> + </li> + <li> + <a href="./less.html">Using LESS</a> +>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 </li> </ul> </div> |