Laurent Destailleur dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php

2015-12-18 21:20:12 +01:00

..

doc_generic_order_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_einstein.modules.php

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

2015-12-18 21:20:12 +01:00

pdf_proforma.modules.php

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

2015-12-18 21:20:12 +01:00