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 for estab, social, plates, menu	2019-09-12 18:24:21 +03:00
back.py	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
common.py	Merge branch 'develop' into feature/refactor-establishments	2019-09-27 10:05:15 +03:00
web.py	fix comments	2020-01-15 22:31:30 +03:00