Laurent Destailleur a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/exports/class/export.class.php

2020-02-17 12:35:34 +01:00

..

export.class.php

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

2020-02-17 12:35:34 +01:00

index.html

…