]> 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: 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)
commit2051130b5add91d7728156695521fe54776c5bd9
treefce64dcbb55bfcaaa1b4cbf8dbfeec493479050dtree | snapshot
parent56fb639f61f63d1111ea41530e49ecadb332bc6bcommit | diff
parentf94d316160d4deb9a0c11b8ed06a2a915387a315commit | diff
Merge branch 'feature_fomichev_erp-86_create_reference_table_for_budget_items_motivation_model' of https://git-bc.gitlab.yandexcloud.net/gitlab-instance/yii-erp24 into develop

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