• Patrick Barroca's avatar
    version 7.11.8 · b131759f
    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