Anatoly 46faf6ecee Merge remote-tracking branch 'origin/develop' into feature/establishment ... # Conflicts: # apps/establishment/admin.py # apps/establishment/serializers.py		2019-08-29 18:19:57 +03:00
..
migrations	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
urls	api establishment-detail	2019-08-29 17:26:22 +03:00
__init__.py	initial app	2019-08-26 18:07:01 +03:00
admin.py	Merge remote-tracking branch 'origin/develop' into feature/establishment	2019-08-29 18:19:57 +03:00
apps.py	update establishment-list endpoint	2019-08-27 12:33:16 +03:00
filters.py	Merge remote-tracking branch 'origin/develop' into feature/establishment	2019-08-29 18:19:57 +03:00
models.py	Merge remote-tracking branch 'origin/develop' into feature/establishment	2019-08-29 18:19:57 +03:00
serializers.py	Merge remote-tracking branch 'origin/develop' into feature/establishment	2019-08-29 18:19:57 +03:00
tasks.py	recalculate price level preview version	2019-08-27 16:53:05 +03:00
tests.py	initial app	2019-08-26 18:07:01 +03:00
views.py	api establishment-detail	2019-08-29 17:26:22 +03:00