Laurent Destailleur 5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php

2020-09-12 04:29:28 +02:00

..

cronjob.class.php

…

index.html

…