littlewolf 470bd096b0 Merge branch 'develop' into feature/fix-country-region-city-transfer ... # Conflicts: # apps/location/models.py # apps/location/transfer_data.py # apps/location/views/common.py # apps/transfer/management/commands/transfer.py # project/settings/local.py		2019-11-21 14:43:30 +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/fix-country-region-city-transfer	2019-11-21 14:43:30 +03:00
templates	New email templates #2	2019-11-05 21:39:17 +03:00
urls	award back api	2019-11-20 16:38:11 +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