Skip to content
Snippets Groups Projects
Commit 651bf525 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

Conflicts:
	htdocs/cron/class/cronjob.class.php
parents ab72fbff cd6a3afc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment