From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 25 Nov 2024 09:34:24 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp-234_upload_add_props_products
X-Git-Tag: 1.7~212^2~12
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b64c2c754ffee158feeee2e98dbb4728546b1cdf;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp-234_upload_add_props_products

# Conflicts:
#	erp24/records/ProductsClass.php
---

b64c2c754ffee158feeee2e98dbb4728546b1cdf