Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php |
||
|---|---|---|
| .. | ||
| adherent_extrafields.php | ||
| adherent_type_extrafields.php | ||
| adherent.php | ||
| public.php | ||