From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Thu, 4 Jul 2024 11:08:01 +0000 (+0300)
Subject: Merge branch 'develop' into feature_filippov_erp-64_switch_lk_to_fact
X-Git-Tag: 1.3~21^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a2436c5cb1d39fcfe1c7656f8405673702210550;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_filippov_erp-64_switch_lk_to_fact

# Conflicts:
#	erp24/controllers/TimetableFactController.php
---

a2436c5cb1d39fcfe1c7656f8405673702210550