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

Browse Source

Conflicts:
	htdocs/projet/class/project.class.php

...

This commit is contained in:

Laurent Destailleur 2020-05-20 23:58:32 +02:00

parent a78bc86465 9e3e8df60f

commit 86de0d5e14

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

1730

htdocs/projet/class/project.class.php

View File

File diff suppressed because it is too large Load Diff