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

Browse Source

Conflicts:
	htdocs/product/card.php

...

This commit is contained in:

Laurent Destailleur 2020-02-18 23:36:42 +01:00

parent ce09ec8805 fa16063875

commit 51bc20a110

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