Laurent Destailleur c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/categories/class/categorie.class.php		2020-08-17 19:59:17 +02:00
..
api_categories.class.php	On _checkAccessToResource: category -> categorie	2020-04-02 12:44:50 +02:00
categorie.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-17 19:59:17 +02:00
index.html