Molkobain 4560f751d1 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ...

# Conflicts:
#	application/displayblock.class.inc.php
#	application/itopwebpage.class.inc.php
#	dictionaries/en.dictionary.itop.ui.php
#	dictionaries/fr.dictionary.itop.ui.php

2023-04-20 12:53:12 +02:00

93 KiB

Raw Blame History

View Raw