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

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

# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_322.php
#	library/startup.php
#	tests/db/UpgradeDBTest.php
parents bdb0221e 3076a150
Branches
Tags
3 merge requests!2334Master,!2147Dev#40650 contractuel 5255 dole preinscription en ligne bressuire concarneau ccvh,!2132dev #59734 first commit
Pipeline #1431 passed with stage
in 11 minutes and 16 seconds
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