]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
authorAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 13:40:52 +0000 (16:40 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Fri, 16 Aug 2024 13:40:52 +0000 (16:40 +0300)
commit11aec3845952f4d6aeeede54a5a81118cea61ab1
tree6f693ab630ad5af96628ca09237b783ed0c94219
parent5cafd7da1aadd69f5b89d858e7cb41a06221537e
parent9fcfb19b874a5c8631f5943d03106f35d941f905
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation

# Conflicts:
# erp24/controllers/MotivationController.php
# erp24/services/MotivationService.php
erp24/controllers/MotivationController.php
erp24/services/MotivationService.php