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

Browse Source

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php

...

This commit is contained in:

Laurent Destailleur 2020-01-10 19:44:52 +01:00

parent 24c499aa44 d7f7f5bf3d

commit ef00cb0736

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