Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_276.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	tests/db/UpgradeDBTest.php

Dev#7270 nanook loan renew errors messages

See merge request !1246

Ab digital resources catalog

See merge request !1245

Merge branch 'dev#32571_probleme_d_affichage_dans_l_ajout_d_album_dans_une_collection' into 'master'

Dev#32571 probleme d affichage dans l ajout d album dans une collection

See merge request !1244

Merge branch 'dev#32501_afficher_le_login_de_la_personne_connectee_dans_l_interface_d_admin' into 'master'

Dev#32501 afficher le login de la personne connectee dans l interface d admin

See merge request !1243

Merge branch 'dev#19303_pagination_des_resultats_de_recherche_pouvoir_afficher_la_pagination_en_haut_de_page' into 'master'

Dev#19303 pagination des resultats de recherche pouvoir afficher la pagination en haut de page

See merge request !1242

Hotline master

See merge request !1230

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline#32417 pb envoi mail fusion pour adulte

See merge request !1229

Merge branch 'hotline#31887_l_extension_de_recherche_vers_gallica_ne_fonctionne_pas' into 'hotline-master'

Hotline#31887 l extension de recherche vers gallica ne fonctionne pas

See merge request !1227

Merge branch 'hotline#32179_quand_on_clique_sur_la_vignette_l_image_s_ouvre_dans_un_nouvel_onglet' into 'stable'

Hotline#32179 quand on clique sur la vignette l image s ouvre dans un nouvel onglet

See merge request !1226

Hotline master

See merge request !1224

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline#32361 impossibilite de charger des images dans le gestionnaire

See merge request !1222

# Conflicts:
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_276.php

Stable

See merge request !1219

Hotline#32112 faille secu explorateur fichiers

See merge request !1218

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	ckeditor/core_five_filemanager/connectors/php/filemanager.php
#	library/startup.php

Hotline#32112 faille secu explorateur fichiers

See merge request !1212

Merge branch 'hotline#32225_gitlabci_i_see_red_people_systemecontrollerwebservicesactiontest_webservicepremieregetresumeshouldwork' into 'stable'

Hotline#32225 gitlabci i see red people systemecontrollerwebservicesactiontest webservicepremieregetresumeshouldwork

See merge request !1213

Hotline#28103 les vignettes d album 1dtouch ne s affichent pas

See merge request !1205

Merge branch 'dev#27763_sitotheque_avoir_une_option_pour_desindexer_un_site_comme_pour_les_articles' into 'master'

Dev#27763 sitotheque avoir une option pour desindexer un site comme pour les articles

See merge request !1217

Merge branch 'master' into dev#27763_sitotheque_avoir_une_option_pour_desindexer_un_site_comme_pour_les_articles

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_272.php