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	Tags indexing and search (by id)	2019-09-10 12:58:39 +03:00
establishment.py	remove tag category from establishment type	2019-10-15 18:52:32 +03:00
news.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00