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

Browse Source

Conflicts:
	htdocs/compta/prelevement/bons.php

...

This commit is contained in:

Laurent Destailleur 2020-05-28 12:27:43 +02:00

parent 88475025af 537b291fab

commit 166cff27c8

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