Laurent Destailleur ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/main.inc.php		2015-07-28 18:57:13 +02:00
..
adherent_extrafields.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2015-05-16 02:53:36 +02:00
adherent_type_extrafields.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2015-05-16 02:53:36 +02:00
adherent.php	Change generic and setup image title	2015-04-18 23:13:48 +02:00
public.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-07-28 18:57:13 +02:00