-
Côme Bernigaud authored
Conflicts: setup/class_setupStep_Checks.inc setup/class_setupStep_Finish.inc setup/class_setupStep_Language.inc setup/class_setupStep_Ldap.inc setup/class_setupStep_Migrate.inc
d1c779f8
Conflicts: setup/class_setupStep_Checks.inc setup/class_setupStep_Finish.inc setup/class_setupStep_Language.inc setup/class_setupStep_Ldap.inc setup/class_setupStep_Migrate.inc