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	gm-148: refactored	2019-10-02 10:16:32 +03:00
back.py	Fix url	2019-10-21 15:31:19 +03:00
mobile.py	Feature/cities by country	2019-10-22 13:00:22 +00:00
web.py	Merge branch 'feature/gm-192' into develop	2019-10-21 10:30:40 +03:00