Laurent Destailleur c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

2018-02-24 12:52:57 +01:00

..

doc_generic_contract_odt.modules.php

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

2018-02-24 12:52:57 +01:00

index.html

…

pdf_strato.modules.php

NEW Mass PDF Merging is available on contracts

2017-09-16 15:39:52 +02:00