Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php |
||
|---|---|---|
| .. | ||
| class | ||
| stats | ||
| tpl | ||
| card.php | ||
| contact.php | ||
| index.php | ||
| list.php | ||
| note.php | ||
| shipment.php | ||
Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php |
||
|---|---|---|
| .. | ||
| class | ||
| stats | ||
| tpl | ||
| card.php | ||
| contact.php | ||
| index.php | ||
| list.php | ||
| note.php | ||
| shipment.php | ||