diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-18 18:40:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-18 18:40:08 +0200 |
| commit | eae43c06dd104784eb16731a2bab9e62b3751750 (patch) | |
| tree | a7d00b6f797d972bd1cd1ec72a18f321f3ca990c /example_project/settings.py | |
| parent | 40eeb69dff20548846b5ef83c9ced0ad4f32e099 (diff) | |
| parent | 0404b15a18f242ca1649b5fadfdc80cf76a94ae6 (diff) | |
| download | Chimère-eae43c06dd104784eb16731a2bab9e62b3751750.tar.bz2 Chimère-eae43c06dd104784eb16731a2bab9e62b3751750.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/forms.py
example_project/settings.py
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index f67ceeb..372f1e6 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -105,6 +105,7 @@ CHIMERE_THUMBS_SCALE_WIDTH=None CHIMERE_SHORT_DESC_LENGTH = 400 CHIMERE_MODIF_EMAIL = _(u"""Hello, I would like to propose you a modification about this item: """) +CHIMERE_CSV_ENCODING = 'ISO-8859-1' ADMINS = ( # ('Your Name', 'your_email@domain.com'), |