Commit d35f201e authored by David Surville's avatar David Surville
Browse files

Merge branch 'laminas_migration' into release-1.2.0 

# Conflicts:
#	config/merged/privilege.config.php
#	view/unicaen-privilege/privilege-categorie/index.phtml
parents 4bb7d91e 936608af