Skip to content
Snippets Groups Projects
Commit 27a1c1f6 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#72435_3_explo_autorite_etape_1_minsoc09_communaute_importer_un_fichier_autorite

Conflicts:
	cosmogramme/sql/patch/patch_351.php
	cosmogramme/sql/patch/patch_353.php
	library/Class/NoticeUnimarc.php
	tests/db/UpgradeDBTest.php
parents 46c69952 96d8f3ee
Branches
Tags 6.44.4
2 merge requests!2894Dev#72435 3 explo autorite etape 1 minsoc09 communaute importer un fichier autorite,!2874Dev#72435 3 explo autorite etape 1 minsoc09 communaute importer un fichier autorite
Pipeline #5234 passed with stage
in 31 minutes and 36 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 365 additions and 158 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