Commit Graph

7 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Anatoly
a09d6b28f1 Merge branch 'feature/gm-80' into develop
# Conflicts:
#	apps/establishment/serializers/back.py
2019-09-19 14:32:10 +03:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
ВашÐВиктор ГладкихÐ
a1ea35fce1 CRUD logic for employee 2019-09-18 18:12:49 +03:00
Dmitriy Kuzmenko
15f02b72ca add email and phone api for establishments 2019-09-13 12:20:36 +03:00
Dmitriy Kuzmenko
efac785248 add api for estab, social, plates, menu 2019-09-12 18:24:21 +03:00