Merge branch 'f-factur-x-und-xrechnung'

author Moritz Bunkus <m.bunkus@linet.de>

Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)

committer Moritz Bunkus <m.bunkus@linet.de>

Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)
author Moritz Bunkus <m.bunkus@linet.de>
Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)
committer Moritz Bunkus <m.bunkus@linet.de>
Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)
diff --cc SL/DB/Helper/FlattenToForm.pm
Simple merge
diff --cc bin/mozilla/io.pl
Simple merge
diff --cc locale/de/all
Simple merge
author	Moritz Bunkus <m.bunkus@linet.de>
	Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)
committer	Moritz Bunkus <m.bunkus@linet.de>
	Thu, 10 Dec 2020 14:58:08 +0000 (15:58 +0100)
		1	2
SL/DB/Helper/FlattenToForm.pm	patch \|	diff1 \|	diff2 \|	blob \| history
bin/mozilla/io.pl	patch \|	diff1 \|	diff2 \|	blob \| history
locale/de/all	patch \|	diff1 \|	diff2 \|	blob \| history