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

version 7.1.44

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/controllers/AccueilController.php
#	application/modules/admin/controllers/SystemeController.php
#	library/Class/AvisNotice.php
#	library/Class/Systeme/ModulesAccueil/Kiosque.php
#	library/startup.php
parents 074f0bde 2175748c
Branches
Tags 7.1.44
2 merge requests!976Master,!975Hotline master
Showing
with 888 additions and 299 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