diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-20 21:25:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-20 21:25:08 +0200 |
| commit | ce0340030c1b35e81903ab78024c5f7caa067af6 (patch) | |
| tree | 2db8c7fddba57f8492cd6aeedf0f675aa180adf8 /example_project/settings.py | |
| parent | 7d739ad85f9b83b0a3692e1b184cb7047b5fb66b (diff) | |
| parent | 98f5da135ccfe9ede29f137f1470024ad296a7bf (diff) | |
| download | Chimère-ce0340030c1b35e81903ab78024c5f7caa067af6.tar.bz2 Chimère-ce0340030c1b35e81903ab78024c5f7caa067af6.zip | |
Merge branch 'master' into eds
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/edit.html
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions