-
Côme Bernigaud authored
Conflicts: include/class_config.inc plugins/admin/users/tabs_user.inc plugins/personal/generic/class_user.inc
c3761cb2
Conflicts: include/class_config.inc plugins/admin/users/tabs_user.inc plugins/personal/generic/class_user.inc