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

Conflicts:
	htdocs/filefunc.inc.php

2017-02-23 02:55:50 +01:00

..

contact.class.php

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

2017-02-23 02:55:50 +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