Anatoly 986936fdf5 Merge remote-tracking branch 'origin/feature/guides' into feature/guides ... # Conflicts: # apps/collection/views/back.py		2019-12-25 22:15:22 +03:00
..
management	Merge branch 'develop' into feature/transfer-guide	2019-12-04 20:16:21 +03:00
migrations	added guide type field, added tasks, refactored GuideElement model, added endpoint,	2019-12-25 22:14:35 +03:00
serializers	Merge remote-tracking branch 'origin/feature/guides' into feature/guides	2019-12-25 22:15:22 +03:00
urls	added guide type field, added tasks, refactored GuideElement model, added endpoint,	2019-12-25 22:14:35 +03:00
views	Merge remote-tracking branch 'origin/feature/guides' into feature/guides	2019-12-25 22:15:22 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	refactored method to get similar list on entities (see todo: establishment/models.py)	2019-12-23 17:53:48 +03:00
apps.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
models.py	added guide type field, added tasks, refactored GuideElement model, added endpoint,	2019-12-25 22:14:35 +03:00
tasks.py	added guide type field, added tasks, refactored GuideElement model, added endpoint,	2019-12-25 22:14:35 +03:00
transfer_data.py	fix transfer	2019-12-20 09:26:45 +03:00