Laurent Destailleur 06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/adherents/subscription/list.php

2019-06-25 13:03:54 +02:00

..

card.php

Fix backward compatibility for type of members

2019-06-25 11:06:10 +02:00

index.html

Move tab menu for subscription in member.lib

2016-09-24 06:48:40 +02:00

info.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

list.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

2019-06-25 13:03:54 +02:00