Anatoly 2d830b2821 Merge branch 'feature/gm-192' into feature/gm-148 ... # Conflicts: # apps/news/models.py # apps/news/serializers.py # apps/news/views.py		2019-10-15 12:08:23 +03:00
..
__init__.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
back.py	gm-148: finish	2019-09-30 15:40:28 +03:00
web.py	refactor news tags	2019-10-09 18:25:40 +03:00