This reverts commit c93a46c0.

This reverts commit d44a3683.

This reverts commit 6cb941ef.

This reverts commit dcc7f809.

This reverts commit 21b5a614.

This reverts commit ca930817.

Conflicts:
	library/Class/Url.php

Merge branch 'hotline#59488_doublons_emprunteurs_des_lecteurs_ne_peuvent_plus_se_connecter_a_leur_compte' into 'hotline-master'

hotline #59488 : create single nanook dedicated user double finder

See merge request !2129

Merge remote-tracking branch 'refs/remotes/origin/dev#56034_3455contractuel_renommer_module_formation'

Merge remote-tracking branch 'refs/remotes/origin/dev#59621_amelioration_ergonomie_popup' into dev#59138_cip_config_zendform_migration

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#59138_cip_config_zendform_migration

Conflicts:
	library/ZendAfi/View/Helper/CoreFiveFileInput.php

Dev#39494 1940 filtres de workflow dans listviewmode

See merge request !2131

Merge branch 'hotline#56180_pnb_dilicom_le_player_ne_s_affiche_pas_dans_un_site_en_https' into 'stable'

hotline #56180 : force https in dilicom preview url if needed

See merge request !2127

Merge remote-tracking branch 'refs/remotes/origin/dev#56034_3455contractuel_renommer_module_formation' into origin-WIP

Conflicts:
	library/Class/AdminVar.php