Laurent Destailleur 6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/holiday/fiche.php		2013-05-11 15:26:24 +02:00
..
contact_extrafields.php	Reveiw extrafield for womplaiance with wiki	2013-04-26 10:29:14 +02:00
societe_extrafields.php	Reveiw extrafield for womplaiance with wiki	2013-04-26 10:29:14 +02:00
societe.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-05-11 15:26:24 +02:00