Laurent Destailleur 754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/modUser.class.php		2020-11-12 14:17:10 +01:00
..
doc_generic_invoice_odt.modules.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-01 17:58:41 +01:00
index.html
pdf_crabe.modules.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-12 14:17:10 +01:00
pdf_sponge.modules.php	Remove warnings	2020-11-12 12:33:29 +01:00