littlewolf 22d2396c6b Merge branch 'develop' into feature/migrate-city-objects ... # Conflicts: # docker-compose.yml # project/settings/base.py		2019-10-09 07:54:15 +03:00
..
migrations	sites endpoint	2019-09-04 10:14:11 +03:00
serializers	refactor address	2019-10-01 18:07:04 +03:00
urls	add api locations for back office	2019-09-18 11:39:46 +03:00
views	refactor address	2019-10-01 18:07:04 +03:00
__init__.py	version 0.0.4: add app locations with models City, Regions, Address, Countries	2019-08-08 17:06:07 +03:00
admin.py	merge transportation	2019-09-17 17:16:35 +03:00
apps.py	version 0.0.4: add app locations with models City, Regions, Address, Countries	2019-08-08 17:06:07 +03:00
models.py	refactor address	2019-10-01 18:07:04 +03:00
tests.py	Fix tests	2019-09-24 21:36:59 +03:00
transfer.py	Add key to transfer	2019-10-09 07:49:44 +03:00