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

Browse Source

Conflicts:
	htdocs/document.php

...

This commit is contained in:

Laurent Destailleur 2020-09-18 14:58:16 +02:00

parent cf8e8ee68b 4decf20aaa

commit 2697f604d5

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