Skip to content
  • Laurent's avatar
    Merge branch 'origin-stable' into hotline-master · 8009aa63
    Laurent authored
    Conflicts:
    	VERSIONS
    	cosmogramme/php/_init.php
    	cosmogramme/sql/patch/patch_264.php
    	cosmogramme/sql/patch/patch_265.php
    	cosmogramme/sql/patch/patch_266.php
    	cosmogramme/sql/patch/patch_267.php
    	library/ZendAfi/View/Helper/Avis.php
    	library/startup.php
    8009aa63