diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-31 09:52:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-31 09:52:28 +0100 |
| commit | b845195fda9c4e9fb79c3f6272d8de202822f57e (patch) | |
| tree | b8014d379e6f5389aa044b2f4b780a2608a794c3 /example_project/settings.py | |
| parent | 61eef049a7c0b476db82b94f61f3a45e21a63ee4 (diff) | |
| parent | 05c66ec70a19ffb5ae22955adcf32bf7190c42ae (diff) | |
| download | Chimère-b845195fda9c4e9fb79c3f6272d8de202822f57e.tar.bz2 Chimère-b845195fda9c4e9fb79c3f6272d8de202822f57e.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/blocks/multimedia_file.html
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions