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/_build/html/_images | |
| 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/_build/html/_images')
| -rw-r--r-- | docs/_build/html/_images/chimere_admin_00.png | bin | 0 -> 5855 bytes |
| -rw-r--r-- | docs/_build/html/_images/chimere_admin_01.png | bin | 0 -> 69448 bytes |
| -rw-r--r-- | docs/_build/html/_images/chimere_admin_02.png | bin | 0 -> 62730 bytes |
| -rw-r--r-- | docs/_build/html/_images/chimere_admin_03.png | bin | 0 -> 65588 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/docs/_build/html/_images/chimere_admin_00.png b/docs/_build/html/_images/chimere_admin_00.png Binary files differnew file mode 100644 index 0000000..374c6b6 --- /dev/null +++ b/docs/_build/html/_images/chimere_admin_00.png diff --git a/docs/_build/html/_images/chimere_admin_01.png b/docs/_build/html/_images/chimere_admin_01.png Binary files differnew file mode 100644 index 0000000..0db7f4d --- /dev/null +++ b/docs/_build/html/_images/chimere_admin_01.png diff --git a/docs/_build/html/_images/chimere_admin_02.png b/docs/_build/html/_images/chimere_admin_02.png Binary files differnew file mode 100644 index 0000000..d0fd6fe --- /dev/null +++ b/docs/_build/html/_images/chimere_admin_02.png diff --git a/docs/_build/html/_images/chimere_admin_03.png b/docs/_build/html/_images/chimere_admin_03.png Binary files differnew file mode 100644 index 0000000..e815500 --- /dev/null +++ b/docs/_build/html/_images/chimere_admin_03.png |
