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