Skip to content
  • Ghislain Loas's avatar
    Merge branch 'stable' into hotline-master · 06d5b418
    Ghislain Loas authored
    Conflicts:
    	VERSIONS
    	application/modules/admin/controllers/AccueilController.php
    	library/startup.php
    	public/admin/css/global.css
    	tests/application/modules/admin/controllers/AccueilControllerTest.php
    	tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
    06d5b418