]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
projects / erp24_rep / yii-erp24 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4a9f06 c4b4ffb)
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)
# Conflicts:
# erp24/views/motivation/index.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.