Anatoly 7dbf594809 Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/account/tasks.py		2019-10-23 15:54:21 +03:00
..
migrations	Merge branch 'develop' into feature/gm-148	2019-10-23 15:54:21 +03:00
urls	Merge branch 'feature/gm-192' into feature/gm-148	2019-10-15 18:33:44 +03:00
views	slugs for news & establishments	2019-09-24 10:38:04 +03:00
__init__.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
admin.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
apps.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
filters.py	establishment list view - added filter by country code	2019-09-02 09:56:55 +03:00
models.py	Merge branch 'develop' into feature/gm-148	2019-10-23 15:54:21 +03:00
serializers.py	Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148	2019-10-23 15:37:14 +03:00
tasks.py	Update tasks.py	2019-10-09 09:46:23 +00:00
tests.py	Fix news tests	2019-10-21 16:21:14 +03:00
views.py	merge from develop	2019-10-23 15:31:04 +03:00