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

Browse Source

Conflicts:
	htdocs/admin/mails.php

...

This commit is contained in:

Laurent Destailleur 2021-01-28 19:54:19 +01:00

parent 1764d3528b 1a52eb5ffa

commit 6306b30499

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