Commit c930208b authored by Patrick Barroca's avatar Patrick Barroca 🤞

Merge remote-tracking branch 'refs/remotes/origin/master' into...

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
parents ca6ab7b1 64edba37
Pipeline #9285 failed with stage
in 51 minutes and 37 seconds