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

Conflicts:
	htdocs/exports/class/export.class.php

2020-01-29 19:28:06 +01:00

..

api_categories.class.php

Merge remote-tracking branch 'upstream/develop' into actioncomm_category

2019-11-18 17:45:52 +01:00

categorie.class.php

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

2020-01-29 19:28:06 +01:00

index.html

…