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	add api locations for back office	2019-09-18 11:39:46 +03:00
back.py	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
common.py	base related qs for cities	2020-01-27 18:45:23 +03:00