Laurent Destailleur 9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/tpl/stockcorrection.tpl.php		2020-08-06 02:15:04 +02:00
..
index.html
pdf_standard.modules.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-06 02:15:04 +02:00