Laurent Destailleur f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang

2015-12-18 22:12:03 +01:00

..

doc_generic_order_odt.modules.php

fix : internationalization

2015-10-03 15:04:03 +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.8' into develop

2015-12-18 22:12:03 +01:00

pdf_proforma.modules.php

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

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