# 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

Hotline#30163 increase oai results per pages

See merge request !1143

Dev#25588 compte utilisateur historique de prets provenant de koha

See merge request !1147

Dev#29558 improve search performances

See merge request !1146