]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_zozirova_erp-65_add_old_shifts
authormarina <m.zozirova@gmail.com>
Thu, 4 Jul 2024 09:12:15 +0000 (12:12 +0300)
committermarina <m.zozirova@gmail.com>
Thu, 4 Jul 2024 09:12:15 +0000 (12:12 +0300)
commitdfe093d17db8f6816d8db2dcd8b56c078ef42983
treec2046c4e0861769e7bf29c0e935ba561520929fc
parent1629e782c5c031792fc6b6469171cbeac86f23e8
parent93baf0fb28c9d2b8cb811c2f23aabd6c7ec4a5ce
Merge branch 'develop' into feature_zozirova_erp-65_add_old_shifts

# Conflicts:
# erp24/controllers/TimetableFactController.php
# erp24/records/TimetableFactModel.php
erp24/controllers/TimetableFactController.php
erp24/records/AdminCheckin.php
erp24/records/Timetable.php
erp24/records/TimetableFactModel.php