From: marina <m.zozirova@gmail.com>
Date: Wed, 22 Jan 2025 06:45:27 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config
X-Git-Tag: 1.7~35^2~37
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c4529c2ac4e25eac319e88d1242d88c84497bbd0;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

# Conflicts:
#	erp24/composer.json
---

c4529c2ac4e25eac319e88d1242d88c84497bbd0
diff --cc erp24/composer.json
index 7f026e53,eb09e325..965f092c
--- a/erp24/composer.json
+++ b/erp24/composer.json
@@@ -36,7 -36,8 +36,8 @@@
          "phpoffice/phpspreadsheet": "^2.2",
          "ext-xmlreader": "*",
          "enqueue/amqp-lib": "^0.10.19",
 -        "vlucas/phpdotenv": "^5.6"
 -
++        "vlucas/phpdotenv": "^5.6",
 +        "softark/yii2-dual-listbox": "^1.0"
      },
      "require-dev": {
          "yiisoft/yii2-debug": "~2.1.0",