Maxime Kohlhaas 04ed2df827 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option ...

# Conflicts:
#	htdocs/imports/import.php

2016-12-11 16:20:46 +01:00

..

import_csv.modules.php

Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option

2016-12-11 16:20:46 +01:00

import_xlsx.modules.php

FIX Travis fails

2016-04-15 16:05:47 +02: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

Mutualize code by moving getter into parent class.

2016-04-11 16:36:00 +02:00