littlewolf c480089f30 Merge branch 'develop' into feature/fix-country-region-city-transfer ... # Conflicts: # _dockerfiles/db/Dockerfile # apps/transfer/management/commands/transfer.py # docker-compose.mysql.yml # project/settings/local.py		2019-12-09 10:41:01 +03:00
..
management	Merge branch 'develop' into feature/transfer-guide	2019-12-04 20:16:21 +03:00
migrations	finalizing transfer guides	2019-12-04 14:21:54 +03:00
serializers	added objects related statistic in Collection backoffice serializer	2019-12-06 17:00:54 +03:00
urls	add back api for collection	2019-11-20 16:29:46 +03:00
views	add back api for collection	2019-11-20 16:29:46 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	finalizing transfer guides	2019-12-04 14:21:54 +03:00
apps.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
models.py	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-12-09 10:41:01 +03:00
transfer_data.py	finalizing transfer guides	2019-12-04 14:21:54 +03:00