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

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php

2020-04-05 03:44:06 +02:00

..

api_categories.class.php

On _checkAccessToResource: category -> categorie

2020-04-02 12:44:50 +02:00

categorie.class.php

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

2020-04-05 03:44:06 +02:00

index.html

…