Laurent Destailleur c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/langs/en_US/errors.lang

2017-01-03 01:34:15 +01:00

..

doc_generic_order_odt.modules.php

NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead

2016-04-17 15:24:22 +02:00

index.html

…

pdf_einstein.modules.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-03 01:34:15 +01:00

pdf_proforma.modules.php

Fix doxygen

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