• Ghislain Loas's avatar
    Merge remote-tracking branch 'refs/remotes/origin/master' into... · cd3cf243
    Ghislain Loas authored
    Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_amelioration_de_la_charte_modele
    
    Conflicts:
    	application/modules/opac/views/scripts/auth/ajax-login.phtml
    	cosmogramme/sql/patch/patch_348.php
    	tests/application/modules/AbstractControllerTestCase.php
    	tests/application/modules/admin/controllers/WidgetControllerTest.php
    	tests/db/UpgradeDBTest.php
    cd3cf243