]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
authorAlexander Smirnov <fredeom@mail.ru>
Thu, 8 Aug 2024 09:08:31 +0000 (12:08 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Thu, 8 Aug 2024 09:08:31 +0000 (12:08 +0300)
commit9c54751809169848583c4d370bdf2b98a95983a6
tree80ba1a0814a9a6f26922b82b7148982226f93fb7
parentd9b8fa29eac8bda6916d930a79338c374f807d9e
parent08c46b1e8b4bc0040a7910604e0c716bc32e9ca1
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW

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