Laurent Destailleur 1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/security2.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php		2020-02-05 14:53:47 +01:00
..
doc_generic_order_odt.modules.php	Update doc_generic_order_odt.modules.php	2019-12-31 14:19:31 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
pdf_einstein.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-05 14:53:47 +01:00
pdf_eratosthene.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-05 14:53:47 +01:00
pdf_proforma.modules.php	Enable new pdf templates as stable	2020-01-20 01:05:30 +01:00