]> 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: 5a0b96a 822c7aa)
Merge branch 'refs/heads/develop' into feature_fomichev_erp-361_week_write_offs_share... feature_fomichev_erp-361_week_write_offs_share_calculation origin/feature_fomichev_erp-361_week_write_offs_share_calculation
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 9 Jun 2025 15:13:13 +0000 (18:13 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 9 Jun 2025 15:13:13 +0000 (18:13 +0300)
commit51bd9318ef70cdbac2d85dedddcba6e851119b2a
tree2f9fce8330d888aa7e916cb3609d08f90de3f9aftree | snapshot
parent5a0b96ae74479255cf08a9251af5d0c77591365ccommit | diff
parent822c7aa573601292399030980b983afad8eeabeecommit | 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.