• Patrick Barroca's avatar
    Merge remote-tracking branch 'refs/remotes/origin/master' into… · c930208b
    Patrick Barroca authored
    Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#79874_explo_contractuel_chambery_connecteur_france_connect
    
    # Conflicts:
    #	.gitmodules
    #	cosmogramme/sql/patch/patch_381.php
    #	public/opac/css/global.css
    #	tests/application/modules/AbstractControllerTestCase.php
    #	tests/db/UpgradeDBTest.php
    c930208b