Skip to content
Snippets Groups Projects
Commit ec6fb9be 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_350.php
	tests/db/UpgradeDBTest.php
parents 00ebbad2 33a0965e
Branches
Tags
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 #4662 failed with stage
in 47 minutes and 42 seconds
Showing
with 212 additions and 156 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