# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_324.php
#	library/startup.php

dev #60742 la souris qui raconte: fix redirect on SSO link

See merge request !2242

# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_324.php
#	library/Class/Cosmogramme/Integration/Record/Bibliondemand.php
#	library/Class/WebService/SIGB/AbstractILSDIPatronInfoReader.php
#	library/startup.php
#	public/opac/java/mycarousel_vertical/valeurs_properties.html
#	tests/db/UpgradeDBTest.php

Dev#17839 9 admin avis

See merge request !2240

Dev#60742 connecteur sso moissonnage la souris qui raconte

See merge request !2239

dev #59498 : digital resource: add Capturator

See merge request !2238

Merge branch 'dev#52401_commande_reservation_impossible_aux_etapes_en_commande_et_en_cours_de_traitement' into 'master'

Dev#52401 commande reservation impossible aux etapes en commande et en cours de traitement

See merge request !2237

Merge branch 'hotline#61801_probleme_d_affichage_des_kiosques_avec_visualisation_barres_verticales' into 'stable'

hotline #61801 : restore required vertical carousel option

See merge request !2236

Hotline#61844 encore des problemes sur la vod

See merge request !2235

Hotline master

See merge request !2232

hotline #62787: fix vertical menu NEWS in summary display mode

See merge request !2231

Merge branch 'hotline#61466_nouveau_mode_affichage_boite_message_d_alertes_non_visibles' into 'hotline-master'

hotline #61466 error messages and tabs have better visibility

See merge request !2230

hotline #61629 : https post when try to change FORCE_HTTPS adminvar

See merge request !2229

Hotline master

See merge request !2222

Merge branch 'hotline#62721_on_ne_peut_plus_imprimer_les_sessions_d_activites_attestations_liste_des_participants_' into 'hotline-master'

hotline #62721 : restore lost print icon

See merge request !2221