Laurent Destailleur 83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php		2020-04-10 01:22:22 +02:00
..
doc_generic_shipment_odt.modules.php	NEW upload odt templates for sendings	2019-12-31 14:30:57 +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_espadon.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-10 01:22:22 +02:00
pdf_merou.modules.php	Fix position on merou	2020-03-14 14:45:37 +01:00
pdf_rouget.modules.php	FIX print pictures in shipment docs	2020-04-09 15:40:36 +02:00