]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config
authormarina <m.zozirova@gmail.com>
Tue, 21 Jan 2025 12:21:03 +0000 (15:21 +0300)
committermarina <m.zozirova@gmail.com>
Tue, 21 Jan 2025 12:21:03 +0000 (15:21 +0300)
commitba4678c4272e9559783a413259e2d24598f33330
tree563ad156a3bd22d800d94d2b51c08d60ad7d1ac4
parent74b8e3d5437c1c87da43349bf8f26b62af5271fe
parentbeac29634df2b526c216fb5455bf3a80d043cf6f
Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

# Conflicts:
# erp24/composer.json
erp24/composer.json
erp24/records/AdminGroup.php