From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 13 Nov 2024 09:18:02 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
X-Git-Tag: 1.6~12^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=277922e0e70a3837bfe932c262e20fcb427e130b;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
---

277922e0e70a3837bfe932c262e20fcb427e130b
diff --cc erp24/media/config/media.config.php
index a0df36c0,83652622..8d866271
--- a/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@@ -25,8 -25,9 +25,9 @@@ return 
              'enableStrictParsing' => false,
              'showScriptName' => false,
              'rules' => [
 +                'GET media/view-image/<id:\d+>' => 'media/view-image'
+                 'flowwow/feed/<id:\d+>' => 'flowwow/feed',
              ],
 -
          ],
          'request' => [
              'scriptUrl' => '/',