forked from Wavyzz/dolibarr
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/theme/eldy/global.inc.php htdocs/theme/eldy/info-box.inc.php
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/theme/eldy/global.inc.php htdocs/theme/eldy/info-box.inc.php