Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts: htdocs/accountancy/journal/bankjournal.php
This commit is contained in:
commit
293c5a5626
Conflicts: htdocs/accountancy/journal/bankjournal.php