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

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php