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 /chimere/forms.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 'chimere/forms.py')
| -rw-r--r-- | chimere/forms.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 7315775..5cf2c63 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -137,7 +137,7 @@ class MarkerAdminFormBase(forms.ModelForm): """ Main form for marker """ - description = forms.CharField(widget=TextareaWidget, required=None) + description = forms.CharField(widget=TextareaWidget, required=False) class Meta: model = Marker |