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

Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang

2019-03-09 01:20:13 +01:00

..

adherent_emails.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-02-01 18:31:44 +01:00

adherent_extrafields.php

PSR2 space after comma in function call

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

adherent_type_extrafields.php

PSR2 space after comma in function call

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

adherent.php

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

2019-03-09 01:20:13 +01:00

index.html

Move tab menu for subscription in member.lib

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

website.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-02-01 18:31:44 +01:00