]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
authormarina <m.zozirova@gmail.com>
Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
committermarina <m.zozirova@gmail.com>
Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
commit0a5dc30ab9899be7a32e386b4d62af644f8ffd80
treec7a86ef80bdb164fc3007956115f914c7ddf24e2
parenta0942a940ddec385756e3df5f3a36d981d6e0ff6
parent12eedc0cb52434ba85c96f11b6ef1fd8123dd76f
Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
# erp24/services/AutoPlannogrammaService.php
erp24/controllers/AutoPlannogrammaController.php
erp24/services/AutoPlannogrammaService.php