Currently translated at 100.0% (3558 of 3558 strings)

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/Class/UrlTest.php

Merge branch 'dev#60288_integration_redmine_ne_pas_rendre_editable_les_infos_techniques_bokeh' into 'master'

Dev#60288 integration redmine ne pas rendre editable les infos techniques bokeh

See merge request !2162

Merge branch 'dev#40650_contractuel_5255_dole_preinscription_en_ligne_bressuire_concarneau_ccvh' into 'master'

Dev#40650 contractuel 5255 dole preinscription en ligne bressuire concarneau ccvh

See merge request !2161

hotline #57929 : do not add default port on https

See merge request !2160

Dev#59734 zendafi form profil page

See merge request !2159

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#59734_zendafi_form_profil_page

Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#40650_contractuel_5255_dole_preinscription_en_ligne_bressuire_concarneau_ccvh

# Conflicts:
#	cosmogramme/php/config_integrations.php

Hotline master

See merge request !2155

# Conflicts:
#	cosmogramme/php/classes/classe_log.php

hotline #60547 : revert too large search and replace of ->ecrire() to ->log() calls

See merge request !2153

Hotline master

See merge request !2150