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
..
base.txt	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
development.txt	update establishment-list endpoint	2019-08-27 12:33:16 +03:00