Laurent Destailleur 55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php		2018-03-12 19:02:30 +01:00
..
contact.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-12 19:02:30 +01:00
index.html