Skip to content
Snippets Groups Projects
Commit e08372ca authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'afi-dev#13060_amelioration_formulaire_inscription' into afi-master

Conflicts:
	application/modules/opac/controllers/AuthController.php
	tests/library/Class/ProfilTest.php
parents cdb5626a a7cf1443
4 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!175Master,!167Master
Showing
with 720 additions and 200 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