Anatoly fd2c1e0ca6 Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148 ... # Conflicts: # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/production.py		2019-10-23 15:37:14 +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 remote-tracking branch 'origin/feature/gm-148' into feature/gm-148	2019-10-23 15:37:14 +03:00
development.py	enabling celery for development and stage settings	2019-10-17 13:49:29 +03:00
local.py	merge from develop	2019-10-23 15:31:04 +03:00
production.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
stage.py	enabling celery for development and stage settings	2019-10-17 13:49:29 +03:00