
Patrick Barroca
authored
Conflicts: cosmogramme/tests/php/classes/NoticeIntegrationTest.php library/Class/Codification.php library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php tests/library/Class/CodificationTest.php
Conflicts: cosmogramme/tests/php/classes/NoticeIntegrationTest.php library/Class/Codification.php library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php tests/library/Class/CodificationTest.php