Skip to content
Snippets Groups Projects
Commit 2ce97428 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into... 

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64203_urgent_probleme_de_connexion_pour_les_abonnes_ayant_plusieurs_sites_de_rattachement_suite_dedoublonnage_sous_nanook_dans_les_4_phases_de_migration

Conflicts:
	tests/application/modules/admin/controllers/UsersControllerTest.php
parents 4222a620 52cf8322
Branches
Tags
2 merge requests!2345Dev#64203 urgent probleme de connexion pour les abonnes ayant plusieurs sites de rattachement suite dedoublonnage sous nanook dans les 4 phases de migration,!2329Dev#64203 urgent probleme de connexion pour les abonnes ayant plusieurs sites de rattachement suite dedoublonnage sous nanook dans les 4 phases de migration
Pipeline #2427 failed with stage
in 20 minutes and 18 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 229 additions and 126 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment