diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
| commit | ea65e5512c236b81e7f4b8757521facadae4b3b8 (patch) | |
| tree | 739cdf40fb6a89de90c4189936d695288a82849f /docs/import_export.rst | |
| parent | 4b0f0777c434f5fa1366ca408c34d257d4833fad (diff) | |
| parent | a55f77a246f99764ff6289686f80825526654e2b (diff) | |
| download | Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.tar.bz2 Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'docs/import_export.rst')
| -rw-r--r-- | docs/import_export.rst | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/import_export.rst b/docs/import_export.rst new file mode 100644 index 0000000..890a644 --- /dev/null +++ b/docs/import_export.rst @@ -0,0 +1,14 @@ +.. -*- coding: utf-8 -*- + +===================== +Chimère import/export +===================== + +:Author: Étienne Loks +:date: 2012-10-08 +:Copyright: CC-BY 3.0 + +This documents presents the administration of Chimère. +The version has been updated for version 2.0.0. + + |