Anatoly 90e53d738d Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/main/models.py # apps/news/admin.py # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/base.py # project/settings/production.py # requirements/base.txt		2019-10-23 12:00:58 +03:00
..
migrations	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
__init__.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
admin.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
apps.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
models.py	Add ordering to timetable object	2019-09-30 14:00:34 +03:00
serialziers.py	gm-80: complete	2019-09-19 14:30:32 +03:00
tests.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
urls.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
views.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00