Currently translated at 100.0% (4634 of 4634 strings)

Conflicts:
	application/modules/opac/controllers/AbonneController.php

Merge branch 'hotline#93337_respect_de_la_licence_lors_d_une_reprise_de_wikipedia_fiche_auteur' into 'hotline'

hotline#93337 : Added mandatory license informations on the author page when…

See merge request !3157

efalcy authored 5 years ago and Arthur Suzuki committed 5 years ago

hotline#93337 : Added mandatory license informations on the author page when data source is provided by Wikipedia

work on bootstrap

See merge request !3162

Merge remote-tracking branch 'refs/remotes/origin/dev#77694_story_rgpd_mise_a_jour_de_la_base_des_utilisateurs_v60' into origin-master

Conflicts:
	library/Class/Users.php

Merge branch 'dev#92109_bdp64_notification_des_bibliotheques_des_inscriptions_lecteurs_v55' into 'master'

Dev#92109 bdp64 notification des bibliotheques des inscriptions lecteurs v55

See merge request !3160

dev#90497 : purge unused files in specific directory

See merge request !3159

hotline #93469 : fix codif thesaurus generation

See merge request !3155

Merge branch 'hotline#92312_favoris_utilisateurs_empecher_la_suppression_de_la_bibliotheque_par_defaut' into 'hotline'

Hotline#92312 favoris utilisateurs empecher la suppression de la bibliotheque par defaut

See merge request !3130

Currently translated at 100.0% (4569 of 4569 strings)

Hotline

See merge request !3153

dev#90496 : Enable Portal Admin to batch delete articles

See merge request !3154

dev #64573 on bootstrap

See merge request !3152

hotline #88224 : for Nanook remove items with same barcode but different record id

See merge request !3145

Merge branch 'hotline#93294_compte_lecteur_liste_des_prets_bloquee_si_liste_de_prets_numeriques_pagination_non_fonctionnelle' into 'hotline'

hotline #93294 : fixes pager usage on account loans page

See merge request !3150

Merge branch 'hotline#90704_affichage_des_articles_par_date_de_debut_de_publication_sans_effet' into 'hotline'

hotline #90704 : Fix issue with Calendar widget : display_order parameter was not used

See merge request !3149

Merge branch 'hotline#90858_bug_pour_generer_les_attestations_de_presence_formation_de_base' into 'hotline'

hotline #90858 : fix error when user is deleted

See merge request !3148