Anatoly c67109d9f8 Merge branch 'develop' into features/migrate-wine ... # Conflicts: # apps/transfer/management/commands/transfer.py # apps/transfer/models.py # project/settings/base.py		2019-11-11 11:35:03 +03:00
..
base.txt	Merge branch 'develop' into features/migrate-wine	2019-11-11 11:35:03 +03:00
development.txt	refactored product app, see changes	2019-11-05 18:04:34 +03:00