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
..
__init__.py	fix settings for stage server	2019-09-16 17:27:42 +03:00
amazon_s3.py	change AWS_S3_CUSTOM_DOMAIN	2019-10-17 18:37:48 +03:00
base.py	Merge branch 'develop' into feature/fix-country-region-city-transfer	2019-11-13 00:28:49 +03:00
development.py	merged develop	2019-11-11 12:01:16 +03:00
local.py	Add tag for product	2019-11-12 17:36:48 +03:00
production.py	merged develop	2019-11-11 12:01:16 +03:00
stage.py	Remove all crunches from projects	2019-11-05 14:29:53 +03:00