]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-242_input_fact_remains
authorAlexander Smirnov <fredeom@mail.ru>
Mon, 2 Dec 2024 08:27:00 +0000 (11:27 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Mon, 2 Dec 2024 08:27:00 +0000 (11:27 +0300)
commitd6193d13aa55c001a8a34e6b873e25c441e18c70
tree3408477a57e6f6a5a99fb8562fd6ff51f316fa15
parent68d3f76131f46dd55469ceaf10cfe3df32af98ac
parent1a618497509016dc709496ca17bb084fadaa4625
Merge branch 'develop' into feature_smirnov_erp-242_input_fact_remains

# Conflicts:
# erp24/controllers/ShiftTransferController.php
erp24/controllers/ShiftTransferController.php
erp24/records/ShiftTransfer.php