Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811
authorMichael Wagner <michael@wagnertech.de>
Fri, 12 Aug 2022 11:53:09 +0000 (13:53 +0200)
committerMichael Wagner <michael@wagnertech.de>
Fri, 12 Aug 2022 11:53:09 +0000 (13:53 +0200)
commit53593baa211863fbf66540cf1bcc36c8fb37257f
tree8448ac07fcf167115b88786e9a0d0b43546c4b20
parentdeb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44
parent549f187d3a2b1d15f96c4556714666ed954447bb
Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

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