Merge branch '2020-leistungsdatum'

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

Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)

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

Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)
author Moritz Bunkus <m.bunkus@linet.de>
Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)
committer Moritz Bunkus <m.bunkus@linet.de>
Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)
diff --cc SL/AR.pm
Simple merge
diff --cc SL/Form.pm
Simple merge
diff --cc bin/mozilla/io.pl
Simple merge
diff --cc locale/de/all
Simple merge
diff --cc templates/webpages/gl/form_header.html
Simple merge
diff --cc templates/webpages/ir/form_header.html
Simple merge
author	Moritz Bunkus <m.bunkus@linet.de>
	Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)
committer	Moritz Bunkus <m.bunkus@linet.de>
	Thu, 3 Dec 2020 13:13:09 +0000 (14:13 +0100)
		1	2
SL/AR.pm	patch \|	diff1 \|	diff2 \|	blob \| history
SL/Form.pm	patch \|	diff1 \|	diff2 \|	blob \| history
bin/mozilla/io.pl	patch \|	diff1 \|	diff2 \|	blob \| history
locale/de/all	patch \|	diff1 \|	diff2 \|	blob \| history
templates/webpages/gl/form_header.html	patch \|	diff1 \|	diff2 \|	blob \| history
templates/webpages/ir/form_header.html	patch \|	diff1 \|	diff2 \|	blob \| history