Merge branch 'b-3.6.1' into mebil

author Michael Wagner <michael@wagnertech.de>

Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)

committer Michael Wagner <michael@wagnertech.de>

Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)
author Michael Wagner <michael@wagnertech.de>
Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)
committer Michael Wagner <michael@wagnertech.de>
Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)
diff --cc SL/DB/Helper/Mappings.pm
Simple merge
diff --cc VERSION

index ee5ae260d725a5ec3afbd809ee01253d36ec4d2d,9575d51bad249b78b01fa517932882eb917cb750..95a00e467494c890e0a1d17ff0c2ea9c8459c04b
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 3.5.8m1
- -3.6.1
++3.6.1m1
diff --cc menus/user/00-erp.yaml
Simple merge
author	Michael Wagner <michael@wagnertech.de>
	Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)
committer	Michael Wagner <michael@wagnertech.de>
	Fri, 15 Jul 2022 17:28:43 +0000 (19:28 +0200)
		1	2
SL/DB/Helper/Mappings.pm	patch \|	diff1 \|	diff2 \|	blob \| history
VERSION	patch \|	diff1 \|	diff2 \|	blob \| history
menus/user/00-erp.yaml	patch \|	diff1 \|	diff2 \|	blob \| history