Laurent Destailleur 0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql

2016-08-28 02:17:04 +02:00

..

cronjob.class.php

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

2016-08-28 02:17:04 +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