Master

See merge request !1516

Conflicts:
	VERSIONS
	library/startup.php

Hotline master

See merge request !1514

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

Conflicts:
	VERSIONS
	library/Class/Users.php
	library/startup.php

Merge branch 'hotline#38918_module_formation_ajout_de_champs_dans_les_modeles_de_courrier_codes_de_champs' into 'stable'

Hotline#38918 module formation ajout de champs dans les modeles de courrier codes de champs

See merge request !1513

Hotline#38583 bug dans le paginateur des groupes d utilisateurs

See merge request !1512

Hotline#37996 activation premier chapitre ok image ancrable nok

See merge request !1511

Hotline master

See merge request !1509

Merge branch 'dev#37314_bibliotheque_mode_d_affichage_un_champ_saisi_un_bloc_a_styliser_dans_la_charte' into dev#32668_bib_form_custom_fields_refacto_master

Conflicts:
	library/Class/Bib.php

Merge remote-tracking branch 'origin/form_custom_fields_refacto' into dev#32668_bib_form_custom_fields_refacto_master

Conflicts:
	VERSIONS
	library/Class/Bib.php
	library/Trait/CustomFields.php
	library/startup.php

Stable

See merge request !1505

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

Conflicts:
	VERSIONS
	library/startup.php

Hotline#38716 calice68 pb catcha sur httpwwwcalice68frauthregister

See merge request !1503

Hotline master

See merge request !1499

Conflicts:
	VERSIONS
	library/startup.php

Hotline#37996 premier chapitre fix urls

See merge request !1497