Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source

Conflicts:
	htdocs/core/lib/functions.lib.php

...

This commit is contained in:

Laurent Destailleur 2021-03-03 12:10:23 +01:00

parent 5f8b52ffc9 da8b67da83

commit e13b01e0d7

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