Conflicts:
	library/ZendAfi/Form.php

Conflicts:
	tests/application/modules/admin/controllers/BibControllerTest.php

Hotline master

See merge request !1845

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

Merge branch 'hotline#48424_champs_persoinnalises_articles_cms_inexploitables_en_facettes' into 'stable'

hotline #48424 : always register customfields

registration should be done not only in dispatch but also in CLI context

See merge request !1842

Hotline master

See merge request !1843

registration should be done not only in dispatch but also in CLI context

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

Conflicts:
	VERSIONS
	library/startup.php
	tests/application/modules/admin/controllers/UsersControllerTest.php

hotline #48667 fix admin users access

See merge request !1839

Hotline master

See merge request !1836

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