# 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

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 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

Merge branch 'hotline#33614_sitotheque_site_non_sauvegarde_a_l_ajout_si_l_url_n_est_pas_valide' into 'hotline-master'

Hotline#33614 sitotheque site non sauvegarde a l ajout si l url n est pas valide

See merge request !1308

Hotline#33603 probleme import url jamendo

See merge request !1305

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

# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#33773_vsmart_impossible_de_se_connecter_a_son_compte_lecteur_lorsque_une_consultation_est_reservee' into 'stable'

Hotline#33773 vsmart impossible de se connecter a son compte lecteur lorsque une consultation est reservee

See merge request !1301

hotline#33773_vsmart_impossible_de_se_connecter_a_son_compte_lecteur_lorsque_une_consultation_est_reservee: fix RT

Hotline#33429 lille metro pb integration cosmogramme

See merge request !1302

Hotline#33756 cosmogramme ne gere pas https avec koha

See merge request !1300

Revert "hotline#33773_vsmart_impossible_de_se_connecter_a_son_compte_lecteur_lorsque_une_consultation_est_reservee: add verif + tests"

This reverts commit 248a965b.

hotline#33773_vsmart_impossible_de_se_connecter_a_son_compte_lecteur_lorsque_une_consultation_est_reservee: add verif + tests

hotline#33773_vsmart_impossible_de_se_connecter_a_son_compte_lecteur_lorsque_une_consultation_est_reservee: add verif + tests

Hotline master

See merge request !1298

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/integration/pseudo_notices.php
#	cosmogramme/php/integre_traite_main.php
#	library/startup.php

Merge branch 'hotline#33501_cosmogramme_modification_des_strategies_par_type_d_operation_inctot' into 'stable'

Hotline#33501 cosmogramme modification des strategies par type d operation inctot

See merge request !1297

Hotline#33472 gros problemes d url suite url rewriting sur prod

See merge request !1296