# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#23466_optimisations_cosmogramme_modifier_le_comportement_du_script_integre_traite_mainphp' into 'hotline-master'

Hotline#23466 optimisations cosmogramme modifier le comportement du script integre traite mainphp

See merge request !1330

Dev#19304 foix bron montauban amelioration systeme d acces au kiosk

See merge request !1329

Dev#30973 pnb backoffice table

See merge request !1328

Merge branch 'hotline#34181_optimisation_de_la_verification_des_permissions_de_categories_d_article' into 'stable'

Hotline#34181 optimisation de la verification des permissions de categories d article

See merge request !1327

Merge branch 'dev#31762_workflow_notifications_2_notifications_aussi_pour_les_statuts_de_workflow_personnalises' into 'master'

Dev#31762 workflow notifications 2 notifications aussi pour les statuts de workflow personnalises

See merge request !1326

Dev#33757 gestion des preferences de l utilisateur

See merge request !1325

dev#25892_module_de_demande_de_consultation_sur_place : replace id_origine by id on reservation links

Hotline master

See merge request !1323

Master

See merge request !1322

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

# Conflicts:
#	VERSIONS
#	library/startup.php

Hotline#33948 statut errone de la disponibilite des documents

See merge request !1320

Master

See merge request !1318

Master

See merge request !1316