Conflicts:
	VERSIONS
	library/startup.php
	tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php

Merge branch 'hotline#26494_filtre_bibliotheque_collant_dans_la_boite_de_recherche_simple' into 'stable'

Hotline#26494 filtre bibliotheque collant dans la boite de recherche simple

See merge request !1162

Hotline#26157 acces kidilangues en test miop

See merge request !1164

Hotline#29412 articles thumbnails in search results

See merge request !1161

Hotline#30015 pas de lien de retour depuis l explorateur de fichiers

See merge request !1157

Merge branch 'hotline#30479_erreur_a_l_affichage_des_plans_de_localisation_pop_up_blanche' into 'stable'

Hotline#30479 erreur a l affichage des plans de localisation pop up blanche

See merge request !1158

Hotline#30520 cceg ouvrir les lien sitotheque dans un nouvel onglet

See merge request !1159

replace <big> style by CSS rule

# Conflicts:
#	library/Class/MoteurRecherche.php
#	library/Class/WebService/Vignette.php
#	tests/application/modules/opac/controllers/RechercheControllerTest.php
#	tests/library/Class/NoticeTest.php

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

Hotline#30487 upgrade inspector gadget

See merge request !1142

Hotline#30747 cms categories with same id and parent

See merge request !1149

Stable

See merge request !1153

Dev#19211 recuperation des visuels cd dans le champ 959

See merge request !1152

Hotline#30163 increase oai results per pages

See merge request !1150

Merge remote-tracking branch 'refs/remotes/origin/dev#30143_create_album_record_thumbnail_from_first_image'

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

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 !1133