Laurent Destailleur 0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/user/card.php		2018-04-11 14:45:11 +02:00
..
contact.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-11 14:45:11 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00