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

Merge branch 'origin-master' into...

Merge branch 'origin-master' into dev#47223_contractuel_module_de_preinscription_a_mettre_en_place_avec_les_web_services_koha_nanook_sans_paiement_en_ligne

Conflicts:
	tests/application/modules/opac/controllers/AuthControllerTest.php
parents 9b8f3b1f bb8d8e3b
Branches
Tags
2 merge requests!1810Dev#47223 contractuel module de preinscription a mettre en place avec les web services koha nanook sans paiement en ligne,!1809Dev#47223 contractuel module de preinscription a mettre en place avec les web services koha nanook sans paiement en ligne
Showing
with 452 additions and 465 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