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

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php

2019-10-07 12:33:13 +02:00

..

import_csv.modules.php

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

2019-10-07 12:33:13 +02:00

import_xlsx.modules.php

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

2019-10-07 12:33:13 +02:00

index.html

…

modules_import.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00