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

Browse Source

Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php

...

This commit is contained in:

Laurent Destailleur 2021-10-26 16:34:25 +02:00

parent 2436f0967b 7393abea8f

commit 7cd09eb649

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