Merge remote-tracking branch 'refs/remotes/origin/dev#73975_creer_des_mails_types_a_envoyer_dans_la_liste_des_fonctionnalites' into origin-master

Conflicts:
	library/Class/Users.php

Dev#73871 minsoc xlst etape 2 association fichier xslt

See merge request afi/opacce!2616

Dev#74368 ajouter les fonctionnalites a la liste existante

See merge request !2614

dev #74357 fix dashbord modules sso url

See merge request !2613

Dev#74174 amelioration de la popup des nouvelles fonctionnalites

See merge request !2612

Master

See merge request !2600

Merge branch 'dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back' into 'master'

Dev#70388 planif contractuel minsoc  formulaire gerer le rendu cote back

See merge request !2599

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back

Conflicts:
	library/Class/AdminVar.php

Master

See merge request !2596

Dev#73870 minsoc xlst etape 1 inspector gadget1

See merge request !2593

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#73870_minsoc_xlst_etape_1_inspector_gadget1

Conflicts:
	library/ZendAfi/View/Helper/Notice/Unimarc.php

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#73871_minsoc_xlst_etape_2_association_fichier_xslt

Conflicts:
	library/Class/AdminVar.php
	library/ZendAfi/View/Helper/Notice/Unimarc.php

Dev#17352 cosmogramme garder l unimarc natif d une notice

See merge request !2549

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#17352_cosmogramme_garder_l_unimarc_natif_d_une_notice

Merge branch 'dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back' into 'dev#73871_minsoc_xlst_etape_2_association_fichier_xslt'

Dev#70388 planif contractuel minsoc  formulaire gerer le rendu cote back

See merge request !2591