Laurent Destailleur 1d9aacc7da Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php

2020-11-05 09:51:28 +01:00

..

import_csv.modules.php

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

2020-11-05 09:51:28 +01:00

import_xlsx.modules.php

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

2020-11-05 09:51:28 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

modules_import.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00