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
..
__init__.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
0001_initial.py	added table EstablishmentSchedule, added application timetable, added table Timetable	2019-08-29 17:59:09 +03:00
0002_auto_20190919_1124.py	gm-80: complete	2019-09-19 14:30:32 +03:00
0003_auto_20191002_0729.py	Revert "remove duplicate migration"	2019-10-09 15:42:46 +03:00
0003_auto_20191003_0943.py	Squashed migrations && added lastable credentials	2019-10-03 13:41:45 +03:00