Hotline master

See merge request !2444

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#67869_probleme_dans_l_interrogation_de_champs_461_titres_de_series' into 'stable'

Hotline#67869 probleme dans l interrogation de champs 461 titres de series

See merge request !2442

hotline #68652 : fix filters / osm interaction in jquery 3

See merge request !2441

Hotline#66282 probleme activation de compte sur un site en https

See merge request !2440

Hotline#64183 bug lien parametrage de boite login

See merge request !2438

Merge branch 'hotline#67202_titres_remplaces_par_d_autres_titres_dans_bokeh_urgent_svp' into 'hotline-master'

Hotline#67202 titres remplaces par d autres titres dans bokeh urgent svp

See merge request !2432

Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into hotline#67202_titres_remplaces_par_d_autres_titres_dans_bokeh_urgent_svp

Master

See merge request !2435

Conflicts:
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css

Merge remote-tracking branch 'refs/remotes/origin/master' into hotline#67202_titres_remplaces_par_d_autres_titres_dans_bokeh_urgent_svp

Currently translated at 100.0% (3570 of 3570 strings)

# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_338.php
#	library/Class/Users.php
#	library/startup.php
#	tests/db/UpgradeDBTest.php

Merge branch 'dev#64923_contractuel_concarneau_personnaliser_le_fonds_de_la_carte_bib' into 'master'

Dev#64923 contractuel concarneau personnaliser le fonds de la carte bib

See merge request !2430

Dev#62896 contractuel sanop miop evolution boite sitotheque

See merge request !2428

Sandbox user password hash

See merge request !2424