
Ghislain Loas
authored
Conflicts: application/modules/opac/controllers/AuthController.php cosmogramme/sql/patch/patch_325.php library/ZendAfi/Controller/Action.php tests/application/modules/opac/controllers/AuthControllerTest.php tests/application/modules/opac/controllers/ModulesControllerTest.php tests/db/UpgradeDBTest.php