Laurent Destailleur a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php

2017-09-12 13:26:25 +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 '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-09-12 13:26:25 +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