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

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

# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_323.php
#	library/Class/CriteresRecherche.php
#	library/startup.php
#	tests/application/modules/admin/controllers/ModulesControllerTest.php
#	tests/db/UpgradeDBTest.php
parents e63a4c52 0ecc5e5e
Branches
Tags
2 merge requests!2334Master,!2184Hotline master
Pipeline #1675 failed with stage
in 13 minutes and 7 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 402 additions and 104 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