Laurent Destailleur 61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/propal/list.php

2018-08-08 17:44:22 +02:00

..

doc_generic_order_odt.modules.php

Fix scrutinizer

2018-05-25 09:31:16 +02:00

index.html

…

pdf_einstein.modules.php

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

2018-08-08 17:44:22 +02:00

pdf_proforma.modules.php

Fix doxygen

2016-05-18 14:43:56 +02:00