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

Browse Source

develop

Conflicts:
	htdocs/compta/localtax/class/localtax.class.php

...

This commit is contained in:

Laurent Destailleur 2021-03-30 16:21:14 +02:00

parent 6e422d26f3 08c7458dd9

commit 22af7a0d10

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