Anatoly 25c63b8097 Merge branch 'develop' into feature/roles ... # Conflicts: # apps/account/models.py # apps/collection/views/back.py # apps/comment/views/back.py # apps/establishment/models.py # apps/establishment/views/back.py # apps/news/views.py # apps/partner/views/back.py		2020-01-30 10:56:46 +03:00
..
__init__.py	added application partner	2019-08-23 16:19:44 +03:00
back.py	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
common.py	Fix queryset	2019-11-27 18:12:22 +03:00
mobile.py	added application partner	2019-08-23 16:19:44 +03:00
web.py	added application partner	2019-08-23 16:19:44 +03:00