Master

See merge request !1553

Hotline master

See merge request !1538

Hotline master

See merge request !1536

Conflicts:
	cosmogramme/sql/patch/patch_288.php
	tests/db/UpgradeDBTest.php

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

Merge branch 'hotline#37405_probleme_d_affichage_de_la_forge_l_interface_d_administration_bokeh' into 'stable'

Hotline#37405 probleme d affichage de la forge l interface d administration bokeh

See merge request !1529

Merge branch 'hotline#37405_probleme_d_affichage_de_la_forge_l_interface_d_administration_bokeh_master' into 'hotline-master'

Hotline#37405 probleme d affichage de la forge l interface d administration bokeh master

See merge request !1530

Merge branch 'hotline#37169_gresivaudan_crolles_changement_de_numero_de_code_barres_abonnes_ne_permet_plus_la_connexion_du_lecteur' into 'hotline-master'

Hotline#37169 gresivaudan crolles changement de numero de code barres abonnes ne permet plus la connexion du lecteur

See merge request !1531

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

test fix

Hotline#38194 les tags sur notices sont effaces a l import total

See merge request !1528

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