• Ghislain Loas's avatar
    Merge remote-tracking branch... · e9d81a90
    Ghislain Loas authored
    Merge remote-tracking branch 'origin/dev#72825_contractuel_bdp64__afficher_la_colonne_reserve_par_d_autres' into origin-master
    
    Conflicts:
    	library/Class/TableDescription.php
    	library/ZendAfi/Controller/Plugin/Abstract.php
    	library/ZendAfi/View/Helper/RenderTable.php
    e9d81a90