Laurent Destailleur 7a69df08c5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/cron/class/cronjob.class.php

2017-07-31 02:39:42 +02:00

..

cronjob.class.php

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

2017-07-31 02:39:42 +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