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

version 7.11.8

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/profil/proprietes.phtml
#	library/startup.php
parents 8800de23 569c5ef3
Branches
Tags
1 merge request!2391Hotline master
Pipeline #2797 failed with stage
in 22 minutes and 20 seconds
Showing
with 230 additions and 140 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