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

Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

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

ba4678c4272e9559783a413259e2d24598f33330
diff --cc erp24/composer.json
index 6fc06647,aede880e..7f026e53
--- a/erp24/composer.json
+++ b/erp24/composer.json
@@@ -35,7 -35,8 +35,8 @@@
          "kartik-v/yii2-widget-datepicker": "dev-master",
          "phpoffice/phpspreadsheet": "^2.2",
          "ext-xmlreader": "*",
 -        "enqueue/amqp-lib": "^0.10.19"
 -
++        "enqueue/amqp-lib": "^0.10.19",
 +        "softark/yii2-dual-listbox": "^1.0"
      },
      "require-dev": {
          "yiisoft/yii2-debug": "~2.1.0",