Fix: conflict
Merge branch '3.4' of git+ssh://git@github.com/hregis/dolibarr.git into 3.4