Merge branch 'feature_fomichev_erp-276_create_table_send_test_messages' into 'develop'

author Aleksey Filippov <aleksey.filippov@erp-flowers.ru>

Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)

committer Aleksey Filippov <aleksey.filippov@erp-flowers.ru>

Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)
author Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)
committer Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)
diff --cc erp24/config/console.php
Simple merge
diff --cc erp24/config/web.php
Simple merge
diff --cc erp24/controllers/UsersMessageManagementController.php
Simple merge
author	Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
	Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)
committer	Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
	Mon, 20 Jan 2025 12:36:15 +0000 (12:36 +0000)
		1	2
erp24/config/console.php	patch \|	diff1 \|	diff2 \|	blob \| history
erp24/config/web.php	patch \|	diff1 \|	diff2 \|	blob \| history
erp24/controllers/UsersMessageManagementController.php	patch \|	diff1 \|	diff2 \|	blob \| history