From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Mon, 19 Jan 2026 10:21:53 +0000 (+0300)
Subject: Merge branch 'develop' into feature_filippov_erp-500_move_secret_to_env
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=54e5728e150bd64171820db710a291903b8ebb85;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_filippov_erp-500_move_secret_to_env

Resolved conflicts:
- .gitignore: accepted develop version
- erp24/agents/*: accepted develop version
- erp24/services/MarketplaceService.php: accepted develop version

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---

54e5728e150bd64171820db710a291903b8ebb85