An error occurred while loading the file. Please try again.
-
efalcy authored
Merge branch 'sandbox_fusion_search_result_and_print' into dev#17782_bonus_1_imprimer_la_liste_des_notices Conflicts: application/modules/opac/controllers/CmsController.php application/modules/opac/controllers/RechercheController.php application/modules/opac/views/scripts/cms/articleviewbydate.phtml cosmogramme/php/_init.php cosmogramme/sql/patch/patch_260.php library/Class/ModeleFusion.php library/Class/Notice.php library/Class/WebService/SIGB/Opsys/Reservation.php library/ZendAfi/Controller/Action.php library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php tests/application/modules/admin/controllers/FormationControllerTest.php tests/application/modules/opac/controllers/RechercheControllerTest.php tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php
60140bc9