From: marina <m.zozirova@gmail.com>
Date: Wed, 18 Jun 2025 12:54:47 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0a5dc30ab9899be7a32e386b4d62af644f8ffd80;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
#	erp24/services/AutoPlannogrammaService.php
---

0a5dc30ab9899be7a32e386b4d62af644f8ffd80