Merge branch 'develop' into Django2.0

2018-07-17 20:57:58 +03:00
parent 48b6ed5b69 563344e8b4
commit cc3aa66e49
33 changed files with 1024 additions and 493 deletions
@@ -9,7 +9,6 @@ from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from auditlog.registry import auditlog
 from phonenumber_field.modelfields import PhoneNumberField
-from django.contrib.postgres.fields import JSONField

 import logging