Skip to content
  • Patrick Barroca's avatar
    version 7.5.20 · 34709783
    Patrick Barroca authored
    Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master
    
    Conflicts:
    	VERSIONS
    	library/ZendAfi/View/Helper/Accueil/Library.php
    	library/startup.php
    	tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
    34709783