Laurent Destailleur 2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/societe/list.php		2016-10-16 19:02:36 +02:00
..
api_category.class.php	categories account like other categories	2016-04-30 14:45:24 +02:00
categorie.class.php	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-10-16 19:02:36 +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