Conflicts:
	VERSIONS
	library/ZendAfi/Controller/Plugin/Manager/Album.php
	library/startup.php

Currently translated at 100.0% (3581 of 3581 strings)

Merge branch 'dev#13615_3555_consultation_de_l_historique_des_prets_depuis_le_compte_lecteur_bokeh_cctp_agglo2b_cctp_concarneau' into 'master'

Dev#13615 3555 consultation de l historique des prets depuis le compte lecteur bokeh cctp agglo2b cctp concarneau

See merge request !2468

Merge branch 'dev#67009_configuration_de_la_boite_bibliotheque_numerique_dans_le_contexte_actuelle_a_de_100000_albums' into 'master'

Dev#67009 configuration de la boite bibliotheque numerique dans le contexte actuelle a de 100000 albums

See merge request !2467

Merge branch 'hotline#69403_catalogue_ajout_d_un_album_a_partir_d_une_notice_en_front_ko' into 'stable'

hotline #69403 : fix add album to record in frontoffice

See merge request !2465

Merge branch 'hotline#66051_ajouter_un_bouton_tester_le_domaine_depuis_l_ecran_de_parametrage_du_domaine' into 'stable'

hotline #66051 : translations

See merge request !2466

Hotline master

See merge request !2463

Conflicts:
	VERSIONS
	library/startup.php
	tests/db/UpgradeDBTest.php

hotline #69326 fix cite de la musique patch

See merge request !2462

Merge branch 'hotline#65216_pb_sur_mise_a_jour_des_articles_apres_modification_d_un_carrousel' into 'stable'

hotline #65216 article edit: when slideshow dialog is closed, validate button enabled

See merge request !2453

hotline #65274 update tlds

See merge request !2454