phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove errors

Browse Source 
Add version to timezonefinder
This commit is contained in:
littlewolf 2019-10-25 10:01:30 +03:00
parent 95b5d4ad99
commit bf375f3370
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/gallery/models.py
View File

@ -27,13 +27,7 @@ class Image(ProjectBaseMixin, SORLImageMixin, PlatformMixin):
blank=True, null=True, default=None, blank=True, null=True, default=None,
verbose_name=_('image orientation')) verbose_name=_('image orientation'))
title = models.CharField(_('title'), max_length=255, default='') title = models.CharField(_('title'), max_length=255, default='')
<<<<<<< HEAD
image = ThumbnailerImageField(upload_to=image_path,
verbose_name=_('Image file'), max_length=255)
=======
objects = ImageQuerySet.as_manager() objects = ImageQuerySet.as_manager()
>>>>>>> develop
class Meta: class Meta:
"""Meta class.""" """Meta class."""

2
requirements/base.txt
View File

@ -9,7 +9,7 @@ fcm-django
django-easy-select2 django-easy-select2
bootstrap-admin bootstrap-admin
drf-yasg==1.16.0 drf-yasg==1.16.0
timezonefinder timezonefinder==4.1.0
PySocks!=1.5.7,>=1.5.6; PySocks!=1.5.7,>=1.5.6;
djangorestframework==3.9.4 djangorestframework==3.9.4