Anatoly c67109d9f8 Merge branch 'develop' into features/migrate-wine ... # Conflicts: # apps/transfer/management/commands/transfer.py # apps/transfer/models.py # project/settings/base.py		2019-11-11 11:35:03 +03:00
..
migrations	finalizing	2019-11-11 11:33:20 +03:00
serializers	Merge branch 'develop' into features/migrate-wine	2019-11-11 11:35:03 +03:00
urls	Feature/cities by country	2019-10-22 13:00:22 +00:00
views	Removed pagination from back regions list view	2019-11-08 10:54:50 +00: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	refactor models	2019-10-31 18:44:30 +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	intermediate commit	2019-11-06 15:35:47 +03:00
tests.py	Fix merge	2019-10-25 15:56:02 +03:00
transfer_data.py	added migrator, refactored migrators	2019-11-09 22:58:34 +03:00
transfer.py	Fix queryset conditions	2019-10-28 00:15:37 +03:00