Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_306.php
	library/Class/Bib.php
	tests/db/UpgradeDBTest.php

Hotline#46804 impossible de modifier la vignette

See merge request !1834

hotline #48476 fix user search criteria conflict with model attributes

See merge request !1833

Merge branch 'hotline#48190_cours_en_ligne_toutaprendre_les_liens_d_un_cours_ne_fonctionnent_pas' into 'stable'

hotline #48190 fix Toutapprendre albums update

See merge request !1831

Merge branch 'hotline#47728_page_mot_de_passe_oublie_changer_le_terme_identifiant_par_n_de_carte' into 'stable'

hotline #47728 fix lostpass page settings

See merge request !1832

Hotline#45936 probleme restituation notices dans kiosques

See merge request !1828

hotline #48448 : PNB : fix gln library rights

See merge request !1829

hotline #47985 : fix problem of category display when saving article

See merge request !1827

Merge branch 'hotline#48515_tester_l_envoie_d_une_newsletter_met_a_jour_le_status_de_derniere_distribution' into 'hotline-master'

hotline #48515 newsletter fix last distribution date after clicking on send test

See merge request !1830

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

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/css/global.css

hotline #47480 fix numeric widget diaporam settings display

See merge request !1823

# Conflicts:
#	library/Class/Catalogue.php

Dev#46257 contractuel bdp yonne finalisation affichage exemplaire

See merge request !1825