Conflicts:
	VERSIONS
	library/startup.php
	tests/application/modules/opac/controllers/AbonneControllerSuggestionAchatTest.php

Hotline#29788 changement d icone

See merge request !1107

Hotline#27654 menu qui se replie

See merge request !1115

Hotline#24999 gestion des isbn a l import cosmogramme

See merge request !1108

Hotline#28305 un redacteur a le droit de modifier le nom de domaine

See merge request !1112

Hotline#29569 portail

See merge request !1110

rel #24999 : Bokeh keeps isbn of document type of "book" pergame family + between multiple isbn, Bokeh keeps only last longest one

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/ZendAfi/MailTest.php

Merge branch 'hotline#29825_facette_dynamique_public_repetition_des_occurrences_pbm_identique_a_st_dizier_resolu_par_ghislain' into 'stable'

Hotline#29825 facette dynamique public repetition des occurrences pbm identique a st dizier resolu par ghislain

c'est à cause de patrick

See merge request !1102

Merge branch 'hotline#29825_facette_dynamique_public_repetition_des_occurrences_pbm_identique_a_st_dizier_resolu_par_ghislain' into 'stable'

Hotline#29825 facette dynamique public repetition des occurrences pbm identique a st dizier resolu par ghislain

See merge request !1096

Merge branch 'hotline#29412_images_des_articles_dans_le_resultat_de_recherche' into 'hotline-master'

Hotline#29412 images des articles dans le resultat de recherche

See merge request !1093

hotline #29825 clean codifThesaurus table where code is null and rules is null in full integration clean phase

Hotline#29345 lettre d information envoi incomplet

See merge request !1098

Hotline#29371 amdin bokeh lien n de version

See merge request !1095

Hotline#29633 envoi newsletter

See merge request !1097

rel #29345 : zend mail validator can throw exceptions on domain validation failure, consider this as an invalid mail

Merge branch 'hotline#29622_la_fonction_explorer_le_serveur_tourne_dans_le_vide' into 'hotline-master'

Hotline#29622 la fonction explorer le serveur tourne dans le vide

See merge request !1094

rel #29622 : fix customized directory traversal protection for shared hosting bokeh with dedicated virtual host

Merge branch 'hotline#29758_bokeh_pays_des_essarts_le_clique_sur_le_mois_suivant_dans_le_calendrier_pbm' into 'stable'

Hotline#29758 bokeh pays des essarts le clique sur le mois suivant dans le calendrier pbm

See merge request !1091