Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php |
||
|---|---|---|
| .. | ||
| contact_extrafields.php | ||
| societe_extrafields.php | ||
| societe.php | ||
Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php |
||
|---|---|---|
| .. | ||
| contact_extrafields.php | ||
| societe_extrafields.php | ||
| societe.php | ||