]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_fomichev_erp_104_agents_services_computation
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Thu, 29 Aug 2024 14:29:29 +0000 (17:29 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Thu, 29 Aug 2024 14:29:29 +0000 (17:29 +0300)
commit32208978d3a7e9f83cb96d3a4bfe74b04928d766
tree68b3a55ace1562a8aa9b748feaac56f4b53ce5e8
parent6dfeeae93adcc6ee3549052b13452bdbb6ad5867
parent56fb639f61f63d1111ea41530e49ecadb332bc6b
Merge branch 'develop' into feature_fomichev_erp_104_agents_services_computation

# Conflicts:
# erp24/services/MotivationService.php
erp24/actions/motivation/IndexAction.php
erp24/services/MotivationService.php