Laurent Destailleur 89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ...

Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php

2018-12-18 21:55:14 +01:00

..

doc

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

2018-12-18 21:55:14 +01:00

index.html

…

mod_commande_marbre.php

FIX change my deprecated email

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

mod_commande_saphir.php

FIX change my deprecated email

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

modules_commande.php

FIX change my deprecated email

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