Conflicts:
	library/Class/MoteurRecherche/Facettes.php
	library/ZendAfi/Form/Configuration/SearchResult.php
	tests/application/modules/admin/controllers/ModulesControllerTest.php
	tests/library/Class/MoteurRecherche/MoteurRechercheFacettesTest.php

Conflicts solved:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_266.php

Hotline master

See merge request !1105

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

Dev#25584 ajout de formulaires qui s envoient par mail

See merge request !1103

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

description) on "indeaxable" checkbox.

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

Update install doc

See merge request !1086

fix patch 267

input on fourth position

fix patch 267

input on fourth position

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

Hotline#29226 notice qui ne veut pas s integrer

See merge request !1090