]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
projects / erp24_rep / yii-erp24 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56fb639 f94d316)
Merge branch 'feature_fomichev_erp-86_create_reference_table_for_budget_items_motivat... origin/feature_fomichev_erp-86_create_reference_table_for_budget_items_motivation_model
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 2 Sep 2024 08:13:21 +0000 (11:13 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 2 Sep 2024 08:13:21 +0000 (11:13 +0300)
# Conflicts:
# erp24/controllers/MotivationController.php
# erp24/records/MotivationCostsItem.php

1  2 
erp24/records/MotivationCostsItem.php patch | diff1 | diff2 | blob | history

diff --cc erp24/records/MotivationCostsItem.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.