Merge branch 'f-cvar-htmlfield'

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

Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)

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

Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
author Moritz Bunkus <m.bunkus@linet.de>
Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
committer Moritz Bunkus <m.bunkus@linet.de>
Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
diff --cc SL/Controller/Order.pm
Simple merge
diff --cc SL/Form.pm
Simple merge
diff --cc locale/de/all
Simple merge
diff --cc locale/en/all
Simple merge
author	Moritz Bunkus <m.bunkus@linet.de>
	Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
committer	Moritz Bunkus <m.bunkus@linet.de>
	Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
		1	2
SL/Controller/Order.pm	patch \|	diff1 \|	diff2 \|	blob \| history
SL/Form.pm	patch \|	diff1 \|	diff2 \|	blob \| history
locale/de/all	patch \|	diff1 \|	diff2 \|	blob \| history
locale/en/all	patch \|	diff1 \|	diff2 \|	blob \| history