Laurent Destailleur 2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php

2016-10-16 19:02:36 +02:00

..

import_csv.modules.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-10-16 19:02:36 +02:00

import_xlsx.modules.php

FIX Travis fails

2016-04-15 16:05:47 +02:00

index.html

…

modules_import.php

Mutualize code by moving getter into parent class.

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