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

Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php

2017-09-13 20:55:22 +02:00

..

adherent_type.class.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-08-11 19:56:17 +02:00

adherent.class.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-09-13 20:55:22 +02:00

adherentstats.class.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

api_members.class.php

Fix delete of member

2017-06-09 17:02:05 +02:00

api_memberstypes.class.php

Fix missing key import_key and extraparams

2017-06-16 12:57:30 +02:00

api_subscriptions.class.php

Fix return code REST similar for all api with POST

2016-12-23 02:08:22 +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

subscription.class.php

Fix: Travis

2016-12-19 06:04:54 +01:00