]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
projects / erp24_rep / yii-erp24 / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d03d1cb 2798128)
Merge branch 'refs/heads/develop' into feature_fomichev_erp-361_week_write_offs_share...
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 6 Jun 2025 11:56:55 +0000 (14:56 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 6 Jun 2025 11:56:55 +0000 (14:56 +0300)
commit98ede454082628077d734119e062f2b1061c0a43
tree60eb4ce2f6003765ba0ad02d5c49a2afe602fba2tree | snapshot
parentd03d1cb2777c8bb20c6cde4cc9d713fb7796eccdcommit | diff
parent27981285c1d6a6380e744b443c06db557107e2ffcommit | diff
Merge branch 'refs/heads/develop' into feature_fomichev_erp-361_week_write_offs_share_calculation

# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/services/AutoPlannogrammaService.php
erp24/controllers/AutoPlannogrammaController.php diff1 | diff2 | blob | history
erp24/services/AutoPlannogrammaService.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.