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

Browse Source

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

...

This commit is contained in:

Laurent Destailleur 2019-03-09 00:02:56 +01:00

parent 4022d5f529 520387c03d

commit 5596b2e9bf

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