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

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

2018-02-22 12:19:20 +01:00

..

cronjob.class.php

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

2018-02-22 12:19:20 +01:00

index.html

…