diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
| commit | 51f788fd4e81186be2f7b7b4459d3d90a7b47bf2 (patch) | |
| tree | 232659156f76ff7664139d963dac8d8c68e1d43f /docs/_build/html/_sources/index.txt | |
| parent | 70811d699e68c075ed3cae543cbb8b695d386730 (diff) | |
| parent | 3aaae876d73a9c16d2961bea9ae2012ae0bc5b0e (diff) | |
| download | Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.tar.bz2 Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/tests.py
chimere/utils.py
Diffstat (limited to 'docs/_build/html/_sources/index.txt')
| -rw-r--r-- | docs/_build/html/_sources/index.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/docs/_build/html/_sources/index.txt b/docs/_build/html/_sources/index.txt deleted file mode 100644 index 45f40e0..0000000 --- a/docs/_build/html/_sources/index.txt +++ /dev/null @@ -1,17 +0,0 @@ -.. Chimère documentation master file, created by - sphinx-quickstart on Wed Feb 15 00:42:28 2012. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to Chimère's documentation! -=================================== - -.. toctree:: - :maxdepth: 2 - - install - upgrade - configuration - customisation - administration - import_export |