-
Côme Bernigaud authored
Conflicts: plugins/admin/users/class_userManagement.inc plugins/personal/generic/class_user.inc setup/class_setupStep_Migrate.inc
533d2fd2
Conflicts: plugins/admin/users/class_userManagement.inc plugins/personal/generic/class_user.inc setup/class_setupStep_Migrate.inc