Laurent Destailleur 8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php

2018-08-08 17:31:23 +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 '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-08 17:31:23 +02:00

pdf_proforma.modules.php

Fix doxygen

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