]> 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>
Tue, 3 Sep 2024 12:02:02 +0000 (15:02 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Tue, 3 Sep 2024 12:02:02 +0000 (15:02 +0300)
commit470ff9a45e1d98a477546bec26f8872cc985cd28
treee8a0b2300320ad34dd992f71ef59a862d9434d99
parentb4a9f06df4aa39f5c154910ecdcc7918c71e7b36
parentc4b4ffb7088c4261ad6dd252feedb3c6c11274e8
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW

# Conflicts:
# erp24/views/motivation/index.php