Pierre Goiffon 4ee70cb95a Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ...

# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
#	pages/ajax.document.php
#	pages/ajax.render.php
#	sources/application/TwigBase/Controller/Controller.php
#	webservices/export-v2.php

2023-12-19 18:38:45 +01:00

104 KiB

Raw Blame History

View Raw