Merge tag 'rel6920'

Conflicts:
	html/index.php
	include/lib/class_html_input.php
This commit is contained in:
Dany De Bontridder 2018-02-23 08:15:40 +01:00
commit 6f9d455d1c

Diff content is not available