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

Browse Source

develop

Conflicts:
	htdocs/user/class/api_users.class.php

...

This commit is contained in:

Laurent Destailleur 2021-04-08 00:37:46 +02:00

parent 489cff46a3 626f252ed8

commit e574e4459f

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