Anatoly 90e53d738d Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/main/models.py # apps/news/admin.py # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/base.py # project/settings/production.py # requirements/base.txt		2019-10-23 12:00:58 +03:00
..
locale/ru/LC_MESSAGES	Login validation error message fix	2019-10-21 08:10:32 +00:00
settings	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
templates	Revert "Password reset confirmation mechanics"	2019-10-14 15:53:40 +03:00
urls	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
__init__.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00
celery.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00
storage_backends.py	gm-148: refactored	2019-10-02 10:16:32 +03:00
wsgi.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00