Laurent Destailleur c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php

2017-01-12 11:06:24 +01:00

..

contact.class.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-01-12 11:06:24 +01: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