Laurent Destailleur 6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php

2018-12-01 19:23:06 +01:00

..

doc_generic_invoice_odt.modules.php

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

2018-12-01 19:23:06 +01:00

index.html

…

pdf_crabe.modules.php

FIX change my deprecated email

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

pdf_sponge.modules.php

FIX change my deprecated email

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