# Conflicts:
#	application/modules/opac/controllers/AbonneController.php
#	tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
#	tests/library/Class/WebService/SIGB/CdScriptTest.php
#	tests/library/Class/WebService/SIGB/NanookTest.php

Currently translated at 100.0% (3101 of 3101 strings)

Currently translated at 100.0% (3101 of 3101 strings)

Merge branch 'dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections' into 'master'

Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections

See merge request !1989

Merge branch 'master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

# Conflicts:
#	tests/application/modules/admin/controllers/NewsletterControllerTest.php

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

# Conflicts:
#	VERSIONS
#	library/startup.php

# Conflicts:
#	library/ZendAfi/View/Helper/Abonne/Loans.php
#	library/ZendAfi/View/Helper/Abonne/ReservationsTable.php

Dev#41303 disable libraries bookmarks

See merge request !1988

Merge branch 'dev#52281_1055_seaside_meilleur_reporting_poker_2_envoi_du_rapport_chez_afi' into 'master'

Dev#52281 1055 seaside meilleur reporting poker 2 envoi du rapport chez afi

See merge request !1987

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

# Conflicts:
#	public/admin/css/global.css
#	public/admin/skins/bokeh74/global.css

hotline #52819 add adminVar

See merge request !1986

Merge branch 'hotline#36347_perte_de_l_affichage_de_l_isbd_apres_les_titres_de_resa_et_les_prets_en_cours' into 'stable'

Hotline#36347 perte de l affichage de l isbd apres les titres de resa et les prets en cours

See merge request !1982

Merge branch 'hotline#53372_boite_calendrier_affichage_nom_de_la_bibliotheque_ko_reserve_va' into 'hotline-master'

hotline #53372 calender: article title display mode option is relevant only on list display mode

See merge request !1983

Merge branch 'hotline#53371_module_bibliotheque_affichage_de_la_carte_sur_l_ecran_detail_d_une_bibliotheque_reserve_va' into 'hotline-master'

hotline #53371 library view: add link to map when location exists

See merge request !1985

Merge branch 'hotline-master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

# Conflicts:
#	application/modules/opac/views/scripts/formations/index.phtml

Merge branch 'plugins_for_controllers' into 'dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections'

full plugin mod for multiselection

See merge request !1968