]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-105_final_fact_motivation
authorAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 13:26:26 +0000 (16:26 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 13:26:26 +0000 (16:26 +0300)
commit5b79e12576044195503bc8eda33db97fc8487a39
treec68a4507a410a3b0a61457ac0995431342ede186
parent30de8407cf902cb0bb8048a56ce2acfd91334c9f
parent9fcfb19b874a5c8631f5943d03106f35d941f905
Merge branch 'develop' into feature_smirnov_erp-105_final_fact_motivation

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