Anatoly f576825a71 Merge branch 'develop' into feature/guides ... # Conflicts: # apps/collection/models.py # apps/establishment/models.py # apps/establishment/views/web.py # apps/product/views/common.py # requirements/base.txt		2019-12-23 13:11:05 +03:00
..
management	Merge branch 'develop' into feature/transfer-guide	2019-12-04 20:16:21 +03:00
migrations	refactored a little bit	2019-12-19 16:39:42 +03:00
serializers	intermediate commit	2019-12-23 12:38:13 +03:00
urls	intermediate commit	2019-12-23 12:38:13 +03:00
views	intermediate commit	2019-12-23 12:38:13 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	finalizing transfer guides	2019-12-04 14:21:54 +03:00
apps.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
models.py	Merge branch 'develop' into feature/guides	2019-12-23 13:11:05 +03:00
transfer_data.py	fix transfer	2019-12-20 09:26:45 +03:00