add rebound link

Merge branch 'dev#32110_bonus_pnb_ecran_intermediaire_de_pret_texte_riche_d_aide_parametrable_par_la_mediatheque' into 'master'

Dev#32110 bonus pnb ecran intermediaire de pret texte riche d aide parametrable par la mediatheque

See merge request !1210

Conflicts:
	tests/application/modules/opac/controllers/SitoControllerTest.php

Dev#27641 renvois bnf auteur mot matieres

See merge request !1208

Merge branch 'dev#25728_bonus_ajouter_la_possibilite_de_flux_rss_a_la_boite_sitotheque' into 'master'

Dev#25728 bonus ajouter la possibilite de flux rss a la boite sitotheque

See merge request !1196

Merge remote-tracking branch 'refs/remotes/origin/dev#27641_les_renvois_d_autorites_bnf_auteur_et_mot_matieres_sont_perdus_a_l_import_total_suivant_bron' into dev#27641_renvois_bnf_auteur_mot_matieres

Conflicts:
	cosmogramme/php/classes/classe_notice_integration.php
	library/Class/Cosmogramme/Integration/PhaseNotice.php

Hotline master

See merge request !1191

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_267.php
#	cosmogramme/sql/patch/patch_268.php
#	library/startup.php

Hotline#31941 pb sur integration d une image dans un article

See merge request !1190

rel #31941: fix customized directory traversal protection for shared hosting Bokeh with dedicated virtual host

Merge branch 'hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour' into 'stable'

Hotline#30552 le pseudo d un utilisateur abonne sigb ne resiste pas a la mise a jour

See merge request !1189

refactoring

Merge branch 'stable' into origin-hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour

Conflicts:
	cosmogramme/sql/patch/patch_267.php

Conflicts:
	cosmogramme/sql/patch/patch_266.php

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php

Hotline#27768 recursive listviewmode articles

Branche recree a partir de master (tests failures)  : 1ere MR http://git.afi-sa.fr/afi/opacce/merge_requests/1169

See merge request !1187

Testing patchs

See merge request !1188