# Conflicts:
#	cosmogramme/sql/patch/patch_322.php
#	tests/db/UpgradeDBTest.php

Merge branch 'dev#15795_1155_importer_la_bibliotheque_de_rattachement_dans_les_comptes_lecteurs' into 'master'

Dev#15795 1155 importer la bibliotheque de rattachement dans les comptes lecteurs

See merge request !2107

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/lieu/index.phtml
#	cosmogramme/sql/patch/patch_320.php
#	cosmogramme/sql/patch/patch_321.php
#	library/startup.php
#	tests/application/modules/opac/controllers/NoticeAjaxControllerItemsTest.php
#	tests/db/UpgradeDBTest.php

Merge branch 'hotline#56365_les_titres_des_mails_des_newletters_sont_tronques_a_35_caracteres' into 'stable'

Hotline#56365 les titres des mails des newletters sont tronques a 35 caracteres

See merge request !2095

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline#56365_les_titres_des_mails_des_newletters_sont_tronques_a_35_caracteres

# Conflicts:
#	cosmogramme/sql/patch/patch_320.php
#	tests/db/UpgradeDBTest.php

#57574 : correction orthographe des jours de la semaine

See merge request !2106

hotline #58096 : reincarnate lost patch from 2015

See merge request !2103

hotline #58543 : add location icon customization in items table

See merge request !2105

Merge branch 'stable' into hotline#56365_les_titres_des_mails_des_newletters_sont_tronques_a_35_caracteres

Hotline master

See merge request !2100

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

# Conflicts:
#	VERSIONS
#	library/digital_resources/Lekiosk/CasLink.php
#	library/digital_resources/Lekiosk/Link.php
#	library/startup.php
#	tests/application/modules/opac/controllers/ModulesControllerTest.php
#	tests/library/Class/LeKioskLinkTest.php

hotline #58461 : LeKiosk SSO link maintenance

See merge request !2099

Merge branch 'hotline#58261_rcm_st_omer_pb_reconnaissance_des_types_doc_de_bibliondemand' into 'hotline-master'

hotline #58261 : force record update for Bibliondemand

See merge request !2098

Hotline#58461 lien lekiosk a modifier

See merge request !2097

Merge branch 'hotline#55166_reservation_bug_dans_le_quota_par_abonne_et_incoherence_du_rang_nanook_bokeh_pour_un_abonne' into 'stable'

hotline #55166 Nanook: on hold with multiple items, the smallest priority is kept

See merge request !2093

hotline #58587 : notify input change on complex form elements

See merge request !2096

Merge branch 'stable' into hotline#56365_les_titres_des_mails_des_newletters_sont_tronques_a_35_caracteres

Merge branch 'stable' into hotline#55166_reservation_bug_dans_le_quota_par_abonne_et_incoherence_du_rang_nanook_bokeh_pour_un_abonne

# Conflicts:
#	VERSIONS
#	library/startup.php