Laurent Destailleur 90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/translation.php

2018-01-11 01:14:20 +01:00

..

doc_generic_contract_odt.modules.php

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

2018-01-11 01:14:20 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

pdf_strato.modules.php

NEW Mass PDF Merging is available on contracts

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