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
..
__init__.py	add api locations for back office	2019-09-18 11:39:46 +03:00
back.py	refactored product, fix transfer and etc., see changelist	2019-11-21 09:58:43 +03:00
common.py	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-21 14:43:30 +03:00