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

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php

2019-08-15 23:39:02 +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-08-15 23:39:02 +02:00