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
..
management	Fix	2019-11-01 16:27:09 +03:00
migrations	Add	2019-10-31 17:04:25 +03:00
serializers	fix swagger	2019-11-11 22:25:05 +03:00
urls	added product RUD-endpoints for back-office	2019-11-12 18:50:59 +03:00
views	fix swagger	2019-11-11 22:25:05 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	fixed problem with image, refactored favorites, collection	2019-09-20 13:35:59 +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-11-13 00:28:49 +03:00