Laurent Destailleur 54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into ...

marcosgdf-bug-3383

Conflicts:
	ChangeLog

2015-09-03 19:12:01 +02:00

..

doc_generic_invoice_odt.modules.php

Fix: Bad parameter of get_substitutionarray_other

2014-10-15 18:16:41 +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_crabe.modules.php

Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into

2015-09-03 19:12:01 +02:00