From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Thu, 13 Jun 2024 12:28:41 +0000 (+0000)
Subject: Merge branch 'develop' into 'master'
X-Git-Tag: 1.2^0
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=8cf1c74dce5f74f082dda37611ef76684b0050c6;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into 'master'

Release 1.2

See merge request gitlab-instance/yii-erp24!179
---

8cf1c74dce5f74f082dda37611ef76684b0050c6