Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source

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

...

This commit is contained in:

Laurent Destailleur 2020-10-23 17:33:14 +02:00

parent 62420c5e7b 377c44eeab

commit cf4ea4168d

1 changed files with 2 additions and 2 deletions

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