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

Browse Source

Conflicts:
	htdocs/adherents/index.php
	htdocs/core/class/html.formmail.class.php

...

This commit is contained in:

Laurent Destailleur 2021-03-21 22:21:37 +01:00

parent 726296b59b 6c89ef803e

commit 2629b129fe

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