Conflicts:
	cosmogramme/sql/patch/patch_348.php
	tests/db/UpgradeDBTest.php

Merge branch 'dev#70619_1440_contractuel_chambery_mise_en_place_d_une_colonne_x_fois_prolonge' into 'master'

Dev#70619 1440 contractuel chambery mise en place d une colonne x fois prolonge

See merge request !2745

Merge branch 'dev#30038_1840_pouvoir_choisir_type_de_tri_notices_par_defaut_dans_la_boite_domaine' into 'master'

Dev#30038 1840 pouvoir choisir type de tri notices par defaut dans la boite domaine

See merge request !2744

Merge branch 'dev#74786_2240_rgpd_ne_plus_envoyer_le_mdp_par_mail_page_de_reinitialisation' into 'master'

Dev#74786 2240 rgpd ne plus envoyer le mdp par mail page de reinitialisation

See merge request !2743

Hotline#76959 vignettes manquantes dans kiosque notices

See merge request !2727

Merge branch 'hotline#77068_orthodidacte_probleme_de_connexion_suite_changement_de_mot_de_passe_' into 'hotline'

Hotline#77068 orthodidacte probleme de connexion suite changement de mot de passe

See merge request !2725

hotline #76992 improve refuse message in article workflow

See merge request !2726

Merge branch 'master' into 'dev#70619_1440_contractuel_chambery_mise_en_place_d_une_colonne_x_fois_prolonge'

Master

See merge request !2734

Merge branch 'master' into 'dev#30038_1840_pouvoir_choisir_type_de_tri_notices_par_defaut_dans_la_boite_domaine'

Master

See merge request !2733

Merge branch 'hotline' into 'hotline#77068_orthodidacte_probleme_de_connexion_suite_changement_de_mot_de_passe_'

Hotline

See merge request !2732

Hotline

See merge request !2731

Hotline

See merge request !2730

Master

See merge request !2729

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#74786_2240_rgpd_ne_plus_envoyer_le_mdp_par_mail_page_de_reinitialisation

Dev thumbnail mocking

See merge request !2728