Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_340.php
	library/startup.php
	tests/fixtures/NanookFixtures.php

Merge branch 'hotline#71540_probleme_de_connexion_d_un_usager_sur_la_webotheque52' into 'hotline-master'

hotline #71540 : CVS : fix xml validity when login contains ampersand

See merge request !2494

hotline #70912 add all editors to record display

See merge request !2493

Merge branch 'hotline#71124_administration_groupes_impossible_d_ajouter_une_categorie_ou_un_groupe' into 'stable'

hotline #71124 : sql migration for circular user group categories

See merge request !2492

Merge branch 'hotline#70872_dvd_barbara_de_saint_pargoire_apparait_dans_le_bandeau_de_gignac' into 'stable'

hotline #70872 update annex of exemplaires when webservice call

See merge request !2491

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

Conflicts:
	VERSIONS
	library/startup.php

hotline #70772 fix adminvar meta validator

See merge request !2483

hotline #67188 fix liraries order in article form

See merge request !2484

Merge branch 'hotline#70867_emprunt_ou_consultation_d_un_document_pnb_oui_non_popup_illisible' into 'stable'

Hotline#70867 emprunt ou consultation d un document pnb oui non popup illisible

See merge request !2488

dev #70765 replace new features link by community day link

See merge request !2490

Currently translated at 100.0% (3605 of 3605 strings)

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

Conflicts:
	VERSIONS
	library/startup.php

Hotline master

See merge request !2482

hotline #70402 fix file manager rename file or folder

See merge request !2475

hotline #66006 : articleview not display article if is in draft mode

See merge request !2476

Merge branch 'hotline#69403_catalogue_ajout_d_un_album_a_partir_d_une_notice_en_front_ko' into 'hotline-master'

hotline #69403 add new required input "created_at" to album popup form

See merge request !2477

hotline #69594 fix articles list filter

See merge request !2478

Merge branch 'hotline#70693_articles_permission_par_defaut_impossible_d_enregistrer_les_modifications' into 'stable'

hotline #70693 remove useless popup

See merge request !2481

Hotline master

See merge request !2479