From: Aleksey Filippov <afilippov@bigland.ru>
Date: Fri, 29 Dec 2023 09:03:10 +0000 (+0300)
Subject: Merge branch 'develop' into feature_filippov_20231208_edit_yii_project
X-Git-Tag: 1.1~194^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c099959cfde1b7b794a88d2a71bd322711015d6a;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_filippov_20231208_edit_yii_project

# Conflicts:
#	erp24/models/LoginForm.php
---

c099959cfde1b7b794a88d2a71bd322711015d6a