From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 26 Feb 2025 12:45:46 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp-338_mp_orders_notifications
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=be2882a9e505acd9cbc80a9cc0b7eb176b2e17e5;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp-338_mp_orders_notifications

# Conflicts:
#	erp24/.gitignore
---

be2882a9e505acd9cbc80a9cc0b7eb176b2e17e5
diff --cc erp24/.gitignore
index 8943eaed,15e3abb7..85c59d70
--- a/erp24/.gitignore
+++ b/erp24/.gitignore
@@@ -41,4 -41,6 +41,7 @@@ tests/_support/_generate
  /runtime/*
  /api2/runtime/*
  /api2/json/*
+ /widgets/app.log
+ /web/dist-prod
 -/pgsql_last.sql
++/pgsql_last.sql
 +/media/notification/*