Laurent Destailleur 7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/user/card.php		2020-06-06 23:04:55 +02:00
..
contact.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-06 23:04:55 +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