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

Merge remote-tracking branch 'refs/remotes/afi/dev_#16861_sso_Kidilangues' into afi-master

# Conflicts:
#	application/modules/opac/controllers/ModulesController.php
#	library/Class/AdminVar.php
#	library/Class/Systeme/ModulesMenu.php
#	library/Class/UserGroup.php
#	library/Class/Users.php
#	tests/application/modules/opac/controllers/ModulesControllerMyCowTest.php
#	tests/application/modules/opac/controllers/ModulesControllerTest.php
#	tests/fixtures/RessourcesNumeriquesFixtures.php
#	tests/library/Class/Systeme/ModulesMenuTest.php
parents db292721 8f9b79e4
3 merge requests!780Master,!772Master,!767Master
Showing
with 465 additions and 50 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