Laurent Destailleur 58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into ... BadPixxel-develop Conflicts: htdocs/langs/en_US/categories.lang htdocs/langs/fr_FR/categories.lang		2014-11-15 12:17:46 +01:00
..
categorie.class.php	Merge branch 'develop' of github.com:BadPixxel/dolibarr into	2014-11-15 12:17:46 +01: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