Skip to content
  • Ghislain Loas's avatar
    Merge branch 'stable' into hotline-master · 4085f7d9
    Ghislain Loas authored
    Conflicts:
    	VERSIONS
    	application/modules/admin/controllers/AlbumController.php
    	library/Class/Indexation/PseudoNotice.php
    	library/ZendAfi/Form/Album.php
    	library/startup.php
    	tests/application/modules/admin/controllers/AlbumControllerTest.php
    4085f7d9