Pierre Goiffon 7864461d85 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design ...

# Conflicts:
#	core/cmdbobject.class.inc.php
#	datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
#	datamodels/2.x/itop-structure/datamodel.itop-structure.xml

2020-11-02 10:30:44 +01:00

24 KiB

Raw Blame History

View Raw