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

Browse Source

develop

Conflicts:
	htdocs/core/modules/oauth/google_oauthcallback.php

...

This commit is contained in:

Laurent Destailleur 2022-01-19 23:04:05 +01:00

parent a5de93cf44 4be8cb5ded

commit dfa2cab408

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