-
Patrick Barroca authored
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
c9459397