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

..

class

Start work to allow updates in import module

2016-08-22 12:25:03 +02:00

emptyexample.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

import.php

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

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

index.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00