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

Browse Source

Conflicts:
	htdocs/admin/mails_templates.php

...

This commit is contained in:

Laurent Destailleur 2020-11-26 23:09:31 +01:00

parent 4114201da9 4da4499569

commit 19339bb0ea

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