Laurent Destailleur 096a568e83 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/extrafields.class.php

2020-02-23 23:42:23 +01:00

..

cronjob.class.php

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

2020-02-23 23:42:23 +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