Merge remote-tracking branch 'refs/remotes/afi/master' into dev#50572_2755_contractuel_pouvoir_gerer_un_site_totalement_prive

# Conflicts:
#	library/ZendAfi/Controller/Plugin/DefineURLs.php

Dev#47709 expiration des sessions sans activite

See merge request !1930

Hotline master

See merge request !1927

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

Conflicts:
	VERSIONS
	library/Class/CodifThesaurus.php
	library/startup.php
	tests/library/Class/CodifThesaurusTest.php

Hotline#50500 mise a jour de la base

See merge request !1926

dev #47709 : Si on trouve un sous domaine correspondant a un rewrite_url d'un profil alors on redirige

Weblate

See merge request !1923

Currently translated at 100.0% (2961 of 2961 strings)

Currently translated at 100.0% (2961 of 2961 strings)

Master

See merge request !1922