Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Pipeline #16877 passed
Stage: publish
Show whitespace changes
Inline Side-by-side
Showing
with 73 additions and 71 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment