Anatoly 90e53d738d Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/main/models.py # apps/news/admin.py # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/base.py # project/settings/production.py # requirements/base.txt		2019-10-23 12:00:58 +03:00
..
__init__.py	fix settings for stage server	2019-09-16 17:27:42 +03:00
amazon_s3.py	gm-148: refactored	2019-10-02 10:16:32 +03:00
base.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
development.py	Merge branch 'develop' into feature/gm-148	2019-10-04 14:31:03 +03:00
local.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
production.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
stage.py	gm-148: refactored	2019-10-02 10:16:32 +03:00