Skip to content
  • Patrick Barroca's avatar
    Merge remote-tracking branch 'refs/remotes/afi/dev_#16861_sso_Kidilangues' into afi-master · 51026cec
    Patrick Barroca authored
    # 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
    51026cec