]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_ERP-325J_category_manager_catalog
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 8 May 2026 09:31:20 +0000 (12:31 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 8 May 2026 09:31:20 +0000 (12:31 +0300)
commitff96295b9b16dbabb2b35e7e5899175a332d649c
tree03ece2c8dfd73cffc1252746a09f289e5e896d00
parent94016dd36fe83d6597d64f272e0af8e4d8b492ba
parentf0e789e249065fabf3c195b5f1d8ea95bc16d055
Merge branch 'refs/heads/develop' into feature_fomichev_ERP-325J_category_manager_catalog

# Conflicts:
# erp24/records/Products1cNomenclature.php
erp24/records/AdminGroup.php
erp24/records/Products1cNomenclature.php