dolibarr/htdocs/categories/class
Laurent Destailleur 252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
..
api_categories.class.php New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
api_deprecated_category.class.php New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
categorie.class.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 15:11: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