Merge branch 'dev#62394_contractuel_afficher_les_raisons_des_actions_non_possibles_prolonger_reserver_koha' into 'WIP'

Dev#62394 contractuel afficher les raisons des actions non possibles prolonger reserver koha

See merge request !2522

Master

See merge request !2523

Dev#71412 negative

See merge request !2520

dev #71411 : jMyCarousel jquery 3 compatibility

See merge request !2519

dev #71921 improve toggle_menu css when loading page

See merge request !2518

Merge branch 'dev#58111_ouvrir_automatiquement_la_note_de_version_a_la_premiere_connection_d_un_administrateur' into 'master'

Dev#58111 ouvrir automatiquement la note de version a la premiere connection d un administrateur

See merge request !2517

Merge branch 'dev#58111_ouvrir_automatiquement_la_note_de_version_a_la_premiere_connection_d_un_administrateur' into 'WIP'

Dev#58111 ouvrir automatiquement la note de version a la premiere connection d un administrateur

See merge request !2515

Merge branch 'dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche' into 'master'

Dev#69826 contractuel minsoc diffusion selective de l information enregistrer modifier ma recherche

See merge request !2516

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#69826_contractuel_minsoc_diffusion_selective_de_l_information_enregistrer_modifier_ma_recherche

Conflicts:
	application/modules/admin/views/scripts/album/edit-images.phtml
	cosmogramme/sql/patch/patch_342.php
	library/ZendAfi/Controller/Plugin/Manager/Sitotheque.php
	library/ZendAfi/View/Helper/TagPreview.php
	library/ZendAfi/View/Helper/TagSlideshow.php
	tests/application/modules/admin/controllers/AdminControllerTest.php
	tests/application/modules/admin/controllers/CatalogueControllerTest.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/admin/controllers/IndexControllerTest.php
	tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
	tests/application/modules/opac/controllers/PanierControllerTest.php
	tests/db/UpgradeDBTest.php
	tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php

Master

See merge request !2514

Dev#71921 amelioration du menu toggle au chargement de la page

See merge request !2512

Hotline master

See merge request !2513

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

dev #71738 : guard memory comsuption of patch 337

See merge request !2511

Dev#71738 check sql patch

See merge request !2509

Master

See merge request !2510

Dev#71715 explorateur de fichiers

See merge request !2508

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

Dev#71664 prettyphoto ko

See merge request !2507

Dev#71715 explorateur de fichiers

See merge request !2505

Master

See merge request !2506