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

Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php

2020-01-29 11:44:04 +01:00

..

api_categories.class.php

Scrutinizer Auto-Fixes

2019-11-16 22:24:29 +00:00

categorie.class.php

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

2020-01-29 11:44:04 +01:00

index.html

…