Merge branch 'f-cvar-htmlfield'
authorMoritz Bunkus <m.bunkus@linet.de>
Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
committerMoritz Bunkus <m.bunkus@linet.de>
Fri, 17 Dec 2021 14:13:09 +0000 (15:13 +0100)
1  2 
SL/Controller/Order.pm
SL/Form.pm
locale/de/all
locale/en/all

Simple merge
diff --cc SL/Form.pm
Simple merge
diff --cc locale/de/all
Simple merge
diff --cc locale/en/all
Simple merge