Laurent Destailleur 09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang

2019-09-06 14:27:01 +02:00

..

doc_generic_reception_odt.modules.php

update code

2019-04-09 09:32:18 +02:00

index.html

…

pdf_squille.modules.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

2019-09-06 14:27:01 +02:00