Laurent Destailleur 28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/projet/card.php		2016-10-16 19:04:33 +02:00
..
api_categories.class.php	Uniformize code.	2016-09-26 02:13:58 +02:00
api_deprecated_category.class.php	Uniformize code.	2016-09-26 02:13:58 +02:00
categorie.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-16 19:04:33 +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