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
..
base.txt	Merge branch 'develop' into feature/guides	2019-12-23 13:11:05 +03:00
development.txt	Fix account migration	2019-11-07 17:01:26 +03:00