]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-137_motivation_forecast
authorAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 06:53:16 +0000 (09:53 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 06:53:16 +0000 (09:53 +0300)
commitb70d791c019850d12d6f04194a6e3837e61f03b2
treeedc686c0c3b0af6585ded225b55bbcc1eef86dbd
parent4c8dd1ade341c7abf990f9cd2d4cf95fa6012567
parent625b8305c209f8e796ad3d5722298039df1a7643
Merge branch 'develop' into feature_smirnov_erp-137_motivation_forecast

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