Conflicts: ChangeLog dev/initdata/mysqldump_dolibarr_3.5.0.sql htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/product/index.php htdocs/user/fiche.php |
||
|---|---|---|
| .. | ||
| address.class.php | ||
| client.class.php | ||
| companybankaccount.class.php | ||
| societe.class.php | ||