Anatoly f576825a71 Merge branch 'develop' into feature/guides ... # Conflicts: # apps/collection/models.py # apps/establishment/models.py # apps/establishment/views/web.py # apps/product/views/common.py # requirements/base.txt		2019-12-23 13:11:05 +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/guides	2019-12-17 14:47:26 +03:00
common.py	Merge branch 'develop' into feature/guides	2019-12-23 13:11:05 +03:00
web.py	add api for estab, social, plates, menu	2019-09-12 18:24:21 +03:00