]> 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: 975931e 736e2bd)
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
authorAlexander Smirnov <fredeom@mail.ru>
Tue, 3 Sep 2024 14:46:41 +0000 (17:46 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Tue, 3 Sep 2024 14:46:41 +0000 (17:46 +0300)
commit1e37446b1b44eb606f5abbda9bea76e4f68948f5
tree07ef6488bbd1131964834afcc7dc9b4e34326422tree | snapshot
parent975931ef1b10d8e4d1189c46fbefe2af1006eb90commit | diff
parent736e2bdadfa33b4b8d521532f98b5b10f045caf2commit | diff
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation

# Conflicts:
# erp24/records/MotivationCostsItem.php
# erp24/services/MotivationService.php
# erp24/views/motivation/index.php
erp24/records/MotivationCostsItem.php diff1 | diff2 | blob | history
erp24/services/MotivationService.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.