Anatoly 471239983e Merge branch 'develop' into feature/guides ... # Conflicts: # apps/collection/views/back.py # apps/transfer/models.py		2019-12-17 14:47:26 +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	rest category & rest cuisine for favs	2019-12-09 16:48:50 +03:00
web.py	add api for estab, social, plates, menu	2019-09-12 18:24:21 +03:00