Regis Houssin 9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ...

develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

2018-10-30 18:29:28 +01:00

..

fileupload_main.tpl.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

fileupload_view.tpl.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

index.html

…

objectlinked_lineimport.tpl.php

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

2018-10-30 18:29:28 +01:00