Conflicts:
	cosmogramme/sql/patch/patch_325.php
	tests/db/UpgradeDBTest.php

Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_log.php
	cosmogramme/php/integre_log.php
	cosmogramme/php/integre_log_sql.php
	cosmogramme/php/integre_traite_main.php
	library/Class/Admin/Skin.php
	library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php
	library/startup.php
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css
	tests/library/Class/MoteurRechercheTest.php

Merge branch 'hotline#59707_affichage_disponibilite_des_exemplaires_dans_la_liste_de_resultats_quand_beaucoup_d_exemplaires' into 'hotline-master'

hotline #59707: adapt popup dialog size to browser window

See merge request !2134

hotline #57923 fix digital library search

See merge request !2140

Hotline#55142 1 dtouch

See merge request !2133

hotline #59808 fix PNB widget rendering when logged as sysadmin

See merge request !2139

hotline #59760 fix center alignment for login form

See merge request !2135

Merge branch 'hotline#59813_l_editeur_css_ne_sauvegarde_pas_les_modifs_sur_pergame_en_ligne' into 'stable'

hotline #59813 display profil header css on top profil rendering even if "use pa…

See merge request !2136

Merge branch 'hotline#57888_disparition_des_champs_du_fichier_dans_le_profil_de_donnees_abonnes' into 'stable'

hotline #57888 fix data profile parsing when fields contains spaces

See merge request !2137

Merge branch 'hotline#59686_probleme_d_absence_d_extension_lors_des_downloads_d_epubs' into 'stable'

Hotline#59686 probleme d absence d extension lors des downloads d epubs

See merge request !2138

hotline #59686 fix action icons on root category for Albums in list view mode + fix opening in blank target

hotline #59813 display profil header css on top profil rendering even if "use parent css" not checked

Conflicts:
	library/Class/WebService/Abstract.php