From: Michael Wagner <michael@wagnertech.de>
Date: Fri, 12 Aug 2022 11:53:09 +0000 (+0200)
Subject: Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811
X-Git-Tag: kivitendo-mebil_0.1-0~10
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=53593baa211863fbf66540cf1bcc36c8fb37257f;p=kivitendo-erp.git

Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

Conflicts:
	SL/Controller/Mebil.pm
	VERSION
	locale/de/all
	menus/user/00-erp.yaml
---