Conflicts: ChangeLog htdocs/admin/propal.php htdocs/compta/journal/purchasesjournal.php htdocs/compta/journal/sellsjournal.php htdocs/core/class/conf.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/core/modules/mailings/contacts2.modules.php htdocs/langs/ca_ES/admin.lang htdocs/langs/en_US/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/fr_FR/admin.lang htdocs/public/demo/index.php |
||
|---|---|---|
| .. | ||
| ajax | ||
| class | ||
| commande | ||
| facture | ||
| paiement | ||
| product | ||
| contact.php | ||
| fiche.php | ||
| index.php | ||
| liste.php | ||
| recap-fourn.php | ||