Anatoly d46ba31654 Merge branch 'develop' into features/migrate-wine ... # Conflicts: # apps/product/models.py # apps/transfer/management/commands/transfer.py # apps/transfer/models.py		2019-11-05 14:56:26 +03:00
..
management	Add product migrate data	2019-10-30 18:04:30 +03:00
migrations	Merge branch 'develop' into features/migrate-wine	2019-11-05 14:56:26 +03:00
serializers	refactor models	2019-10-31 18:44:30 +03:00
urls	gm-259, gm-260, gm-261	2019-10-29 17:16:39 +03:00
views	gm-259, gm-260, gm-261	2019-10-29 17:16:39 +03:00
__init__.py	Initial app Product	2019-09-20 12:13:26 +03:00
admin.py	intermediate commit	2019-11-01 14:09:54 +03:00
apps.py	Initial app Product	2019-09-20 12:13:26 +03:00
filters.py	gm-259, gm-260, gm-261	2019-10-29 17:16:39 +03:00
models.py	added migrations and added migration wine colors	2019-11-01 16:48:49 +03:00
transfer_data.py	added migrations and added migration wine colors	2019-11-01 16:48:49 +03:00