diff options
| author | Nawa <bellefeegore@follepensee.net> | 2012-11-29 00:53:46 +0100 |
|---|---|---|
| committer | Nawa <bellefeegore@follepensee.net> | 2012-11-29 00:53:46 +0100 |
| commit | 397ee721cef7627201f32226334a2cb57f73318f (patch) | |
| tree | cac418a132373cf2aa40b02cf8a16917a34025c9 /docs/_build/html/index.html | |
| parent | 3b63d13346bc3392c57859f6390a55863387f894 (diff) | |
| parent | 72ede57e660210de690e2641732a1860e87a2818 (diff) | |
| download | Chimère-397ee721cef7627201f32226334a2cb57f73318f.tar.bz2 Chimère-397ee721cef7627201f32226334a2cb57f73318f.zip | |
Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimere
Conflicts:
docs/_build/html/administration.html
docs/_build/html/customisation.html
docs/_build/html/import_export.html
docs/_build/html/searchindex.js
Diffstat (limited to 'docs/_build/html/index.html')
| -rw-r--r-- | docs/_build/html/index.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html index adf3c68..216ee3f 100644 --- a/docs/_build/html/index.html +++ b/docs/_build/html/index.html @@ -81,11 +81,12 @@ <li class="toctree-l2"><a class="reference internal" href="administration.html#managing-end-user-amendment">Managing end user amendment</a></li> </ul> </li> -<li class="toctree-l1"><a class="reference internal" href="import_export.html">Chimère import/export</a><ul> +<li class="toctree-l1"><a class="reference internal" href="import_export.html">Import/export</a><ul> <li class="toctree-l2"><a class="reference internal" href="import_export.html#importing">Importing</a></li> +<li class="toctree-l2"><a class="reference internal" href="import_export.html#exporting">Exporting</a></li> </ul> </li> -<li class="toctree-l1"><a class="reference internal" href="customisation.html">Chimère customisation</a><ul> +<li class="toctree-l1"><a class="reference internal" href="customisation.html">Customisation</a><ul> <li class="toctree-l2"><a class="reference internal" href="customisation.html#managing-layers">Managing layers</a></li> <li class="toctree-l2"><a class="reference internal" href="customisation.html#customizing-the-layout-and-the-design">Customizing the layout and the design</a></li> </ul> |