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

Browse Source

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

...

This commit is contained in:

Laurent Destailleur 2020-10-23 17:38:01 +02:00

parent f00fa93903 50da1cd95e

commit ae4020c9fe

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