Skip to content
  • efalcy's avatar
    Merge branch 'hotline_#26977_url_blog_critiques' into stable · d94472ea
    efalcy authored
    Conflicts:
    	library/Class/Newsletter.php
    	library/ZendAfi/View/Helper/Accueil/Critiques.php
    	library/ZendAfi/View/Helper/TagAnchor.php
    	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
    	tests/library/Class/NewsletterMailingTest.php
    d94472ea