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

Merge branch 'dev#37281_nouvelle_sitotheque_dans_une_boite_bibliotheque_numerique_pouvoir_choisir_d_afficher_les_ressources_les_plus_recentes' into 'master'

Dev#37281 nouvelle sitotheque dans une boite bibliotheque numerique pouvoir choisir d afficher les ressources les plus recentes

See merge request !1533

Hotline master

See merge request !1523

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

Conflicts:
	VERSIONS
	library/startup.php

Merge branch 'hotline#38236_pb_dans_le_selection_de_bibliotheques_pour_la_recherche_de_la_page_catalogue' into 'stable'

Hotline#38236 pb dans le selection de bibliotheques pour la recherche de la page catalogue

See merge request !1522

Merge branch 'dev#32668_bib_form_custom_fields_refacto_master' into origin-dev#32668_bib_form_custom_fields_refacto_master

Merge branch 'hotline#37078_cosmogramme_le_lien_de_generation_de_site_nanook_ne_cree_pas_les_imports_paniers' into 'stable'

Hotline#37078 cosmogramme le lien de generation de site nanook ne cree pas les imports paniers

See merge request !1518

Merge branch 'hotline#39088_nouvelle_charte_backoffice_les_listes_de_cases_a_cocher_s_affichent_mal' into 'hotline-master'

Hotline#39088 nouvelle charte backoffice les listes de cases a cocher s affichent mal

See merge request !1521

fix tests

add tests

fix css

add pagination on paginated strategy

add tests

Master

See merge request !1516

Conflicts:
	VERSIONS
	library/startup.php

add paginated configuration

Hotline master

See merge request !1514

refacto bibnum view helper (strategy)

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