Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang		2018-04-12 13:31:14 +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_canelle.modules.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +02:00