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	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-21 14:43:30 +03:00
development.py	Fix ELASTICSEARCH_DSL_AUTOSYNCOC	2019-11-21 11:16:02 +03:00
local.py	change settings	2019-11-21 00:45:48 +03:00
production.py	New ES index	2019-11-13 18:43:30 +03:00
stage.py	Remove all crunches from projects	2019-11-05 14:29:53 +03:00