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

Browse Source

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

...

This commit is contained in:

Laurent Destailleur 2020-06-28 21:46:08 +02:00

parent 0eac798674 1194c61857

commit 8dee17446d

1 changed files with 1 additions and 1 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