Pierre Goiffon 0d1059a8fc Merge remote-tracking branch 'origin/support/2.6' into support/2.7 ...

# Conflicts:
#	application/utils.inc.php
#	conf/web.config
#	datamodels/2.x/itop-backup/ajax.backup.php
#	datamodels/2.x/itop-backup/status.php

2020-05-18 09:24:46 +02:00

17 KiB

Raw Blame History

View Raw