Merge branch 'bug/360_max-length-given-by-string' into django-1.9-fixes

* bug/360_max-length-given-by-string:
  changed max_length given by string to integer;
This commit is contained in:
Alex Seeholzer 2015-12-15 10:21:04 +01:00
commit 54e541230e

View File

@ -1213,7 +1213,7 @@ class CustomField(models.Model):
label = models.CharField(
_('Label'),
max_length='30',
max_length=30,
help_text=_('The display label for this field'),
)