]> 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>
Wed, 22 Jan 2025 06:45:27 +0000 (09:45 +0300)
committermarina <m.zozirova@gmail.com>
Wed, 22 Jan 2025 06:45:27 +0000 (09:45 +0300)
commitc4529c2ac4e25eac319e88d1242d88c84497bbd0
treea9deb7276a00bb5b5519f5aea32d00e1efc7e836
parent43c9ebb6bffb2c3ea58fd38c5053f2e301b72808
parentfd84b35e1b4bd20b73271e62ef740f36f84e0b51
Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

# Conflicts:
# erp24/composer.json
erp24/composer.json