Skip to content
Snippets Groups Projects
Commit 8b7e2eb2 authored by efalcy's avatar efalcy
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'refs/remotes/origin/dev#27641_les_renvois_d_autorites_bnf_auteur_et_mot_matieres_sont_perdus_a_l_import_total_suivant_bron' into dev#27641_renvois_bnf_auteur_mot_matieres

Conflicts:
	cosmogramme/php/classes/classe_notice_integration.php
	library/Class/Cosmogramme/Integration/PhaseNotice.php
parents a42c4d0a 05ea34ae
Branches
Tags
3 merge requests!1267Master,!1208Dev#27641 renvois bnf auteur mot matieres,!1194Dev#27641 renvois bnf auteur mot matieres
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 877 additions and 628 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment