littlewolf cf226974c8 Merge branch 'develop' into feature/fix-country-region-city-transfer ... # Conflicts: # apps/collection/models.py # apps/location/serializers/common.py # apps/location/transfer_data.py # apps/transfer/management/commands/transfer.py # apps/transfer/serializers/location.py # project/settings/base.py		2019-11-13 00:28:49 +03:00
..
migrations	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +03:00
serializers	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +03:00
urls	Add endpoints to gallery	2019-11-07 15:35:06 +03:00
views	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +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	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	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +03:00
tests.py	Fix location city gallery	2019-11-08 01:50:55 +03:00
transfer_data.py	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +03:00
transfer.py	Fix queryset conditions	2019-10-28 00:15:37 +03:00