Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source

Conflicts:
	htdocs/core/class/utils.class.php

...

This commit is contained in:

Laurent Destailleur 2022-03-10 15:49:51 +01:00

parent 10e32c056e 5d942c9d1a

commit af6e95aa79

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available