Laurent Destailleur 97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php

2016-08-01 15:03:59 +02:00

..

doc_generic_shipment_odt.modules.php

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

2016-04-17 15:24:22 +02: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_merou.modules.php

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

2016-08-01 15:03:59 +02:00

pdf_rouget.modules.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-08-01 15:01:14 +02:00