-
Côme Chilliet authored
Conflicts: dhcp/admin/dhcp/class_dhcpConfiguration.inc dhcp/admin/systems/services/dhcp/class_serviceDHCP.inc fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc kolab2/admin/systems/services/kolab2/class_serviceKolab.inc ppolicy/personal/ppolicy/class_ppolicyAccount.inc systems/admin/systems/class_printGeneric.inc systems/admin/systems/class_systemManagement.inc systems/admin/systems/class_terminalGeneric.inc systems/admin/systems/class_terminalStartup.inc
e83da6a0