Merge branch 'origin-master' into dev#64573_templates_pour_l_interface_publique_libraire_bootstrap_v55

Conflicts:
	tests/library/Class/WebService/LastfmTest.php
	tests/library/ZendAfi/View/Helper/Abonne/AbonnementTest.php

Dev#93553 federation des avis

See merge request !3248

Conflicts:
	cosmogramme/sql/patch/patch_377.php
	doc/extern_libs.org
	library/ZendAfi/View/Helper/Admin/HelpLink.php
	tests/db/UpgradeDBTest.php

Merge branch 'dev#78968_contractuel_st_cloud_995n_vs_995n_differenciation_de_la_casse_v40' into 'master'

dev #78968 : add uppercase location rule matching

See merge request !3238

hotline #96451 fix mail subject encoding when length > 78 characters

See merge request !3233

Merge branch 'dev#90319_contractuel_saint_cloud_tableau_resa_afficher_date_limite_de_retrait' into 'master'

dev #90319 : Orphee ILS : display end hold date in holds table

See merge request !3235

Conflicts:
	cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
	cosmogramme/php/fonctions/objets_saisie.php
	cosmogramme/sql/patch/patch_377.php
	tests/db/UpgradeDBTest.php

Arthur Suzuki authored 5 years ago and Laurent committed 5 years ago

dev #86039 prepares calendar hold

dev #96423 ILS Orphee: add hold item option

See merge request !3228

Dev#94469 minsoc autorites recherche dediee aux autorites

See merge request !3226

Dev#92386 import periodiques pmb

See merge request !3191

dev #95747 add supports for memcached extension

See merge request !3224

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#94469_minsoc_autorites_recherche_dediee_aux_autorites

Merge branch 'dev#55588_contractuel_explo_solr_indexation_en_texte_integral_des_documents_lies_pdf_html_bulletins_officiels_minsoc' into 'master'

Dev#55588 contractuel explo solr indexation en texte integral des documents lies pdf html bulletins officiels minsoc

See merge request !3218

hotline#95613 : redmine add download attachment

See merge request !3214

Hotline

See merge request !3212

Merge branch 'hotline#95190_export_des_medias_de_la_bibliotheque_numerique_sous_excel' into 'hotline'

hotline#95190: Export CSV des medias

See merge request !3206

hotline#68507 : SIGB Koha : pre-registration dateformat updated

See merge request !3209

Merge branch 'hotline#95885_afficher_les_horaires_d_ouverture_sur_le_detail_bibliotheque_de_la_version_smartphone' into 'hotline'

hotline#95885 : Recherche : fix opening time display for libraries in smartphone view.

See merge request !3210

hotline#94332 : SIGB : fix special char transformation, html code sent from a…

See merge request !3211