Conflicts:
	application/modules/admin/views/scripts/users/index.phtml
	tests/application/modules/admin/controllers/UsersControllerTest.php

# Conflicts:
#	public/admin/skins/bokeh74/jquery.css

hotline #64607 fix drag and drop in article widget settings

See merge request !2342

Hotline#64837 probleme de parametrage de droits

See merge request !2343

Dev#39361 mode d affichage a la pinterest

See merge request !2346

Merge branch 'dev#64203_urgent_probleme_de_connexion_pour_les_abonnes_ayant_plusieurs_sites_de_rattachement_suite_dedoublonnage_sous_nanook_dans_les_4_phases_de_migration' into 'master'

Dev#64203 urgent probleme de connexion pour les abonnes ayant plusieurs sites de rattachement suite dedoublonnage sous nanook dans les 4 phases de migration

See merge request !2345

hotline #59093 fix update banner

See merge request !2340

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#39361_mode_d_affichage_a_la_pinterest

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64203_urgent_probleme_de_connexion_pour_les_abonnes_ayant_plusieurs_sites_de_rattachement_suite_dedoublonnage_sous_nanook_dans_les_4_phases_de_migration

# Conflicts:
#	public/admin/skins/bokeh74/jquery.css

hotline #65088 : do not recreate int_bib on standard update

See merge request !2338

Stable

See merge request !2336

Merge branch 'hotline#64747_parametres_de_la_boite_articles_en_mode_selection_ne_devrait_pas_afficher_nombre_d_articles_a_afficher_analyser' into 'stable'

hotline #64747 fix articles widget configuration on back office

See merge request !2331