Regis Houssin 9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php		2018-10-30 18:29:28 +01:00
..
doc_generic_supplier_proposal_odt.modules.php	fill empty catch with log	2018-10-26 21:09:46 +02:00
index.html
pdf_aurore.modules.php	FIX change my deprecated email	2018-10-27 14:43:12 +02:00