Laurent Destailleur b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/extrafields_add.tpl.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php		2020-04-05 04:03:53 +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 develop	2020-04-05 04:03:53 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00