Laurent Destailleur 2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php		2020-05-28 20:20:39 +02:00
..
doc_generic_invoice_odt.modules.php	add new rule	2020-05-21 15:05:19 +02: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_crabe.modules.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-28 20:20:39 +02:00
pdf_sponge.modules.php	add new rule	2020-05-21 15:05:19 +02:00