Laurent Destailleur 1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/contact/class/contact.class.php		2021-06-29 15:52:39 +02:00
..
contact.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-06-29 15:52:39 +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