Pierre Goiffon 1a3f836a5a Merge remote-tracking branch 'origin/release/2.6' into develop ...

# Conflicts:
#	application/itopwebpage.class.inc.php
#	core/config.class.inc.php
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
#	datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
#	datamodels/2.x/version.xml

2018-12-21 10:26:17 +01:00

122 KiB

Raw Blame History

View Raw