mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: ChangeLog htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/product/doc/pdf_standard.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php htdocs/filefunc.inc.php |
||
|---|---|---|
| .. | ||
| doc_generic_order_odt.modules.php | ||
| index.html | ||
| pdf_einstein.modules.php | ||
| pdf_eratosthene.modules.php | ||
| pdf_proforma.modules.php | ||