Conflicts:
	application/modules/opac/views/scripts/cms/calendar.phtml
	tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php

hotline #78264 fix lekiosk dashboard

See merge request !2790

hotline #78773 fix calendar days incrementation

See merge request !2792

Merge branch 'dev#74897_1_minsoc09_xlst_etape_3_association_fichier_xslt_a_l_entete_et_prise_en_compte_dans_resultat_recherche' into 'master'

Dev#74897 1 minsoc09 xlst etape 3 association fichier xslt a l entete et prise en compte dans resultat recherche

See merge request !2796

Dev#76156 1240 st cloud maj fonctionnement agenda

See merge request !2794

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#76156_1240_st_cloud_maj_fonctionnement_agenda

Hotline

See merge request !2788

hotline #78596 fix features list

See merge request !2787

Merge branch…

See merge request !2786

Merge branch 'dev#65688_2355bonus_contractuel_koha_prise_en_compte_du_statut_en_transfert_desormais_renvoye_par_ilsdi' into 'WIP'

Dev#65688 2355bonus contractuel koha prise en compte du statut en transfert desormais renvoye par ilsdi

See merge request !2760

(cherry picked from commit 7c7c205a)

9ec95c0b dev #65688 : add fixture koha transfert
2ac8483b dev #65688 : display transfer on koha disponibility
28d80e8c dev #65688 : fix tests
972fc5a6 Merge branch 'fix_fnac_tests' into 'hotline'
98104cfb dev #65688 : format
05065c92 Merge branch 'cherry-pick-0af87c95' into…
d7eb8bc8 dev #65688 : replace 'en transfert de .. a ..' by 'en transfert' and fix translations
5554af0a Merge branch…
d15ae828 dev #65688 : delete file features
72ce5c4e dev #65688 : fix tests
99e55390 dev #65688 : fix tests
1fd5b22e Merge branch 'master' into…
566e3cf0 Merge remote-tracking branch 'remotes/origin/master' into…
c89a1616 dev #65688 remove xdebug_break + fix indent

Currently translated at 100.0% (4100 of 4100 strings)

Hotline

See merge request !2785

Merge branch 'dev#73084_concarneau_cca29_carte_interactive_clique_sur_pointeur_decalage_contractuel' into 'master'

dev #73084 replace map after popup close

See merge request !2784

hotline #78528 add htm to authorized extensions in htaccess

See merge request !2782

hotline #78405 fix saving dewey without label

See merge request !2777

Merge branch 'hotline#78169_les_suggestions_emises_dans_bokeh_n_arrivent_pas_dans_koha' into 'hotline'

hotline #78169 add inspector_gadget to provide suggest

See merge request !2778

Merge branch 'hotline#78376_kiosque_de_notices_non_visible_dans_un_album_zone_descriptive' into 'hotline'

hotline #78376 handle carousel rendering in record detail

See merge request !2779