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

Browse Source

develop

Conflicts:
	htdocs/admin/pdf.php

...

This commit is contained in:

Laurent Destailleur 2020-12-09 17:41:07 +01:00

parent 075cacb8cf 30da1ab8b2

commit 9e8cc7e0f6

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