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

Browse Source

Conflicts:
	htdocs/product/class/product.class.php

...

This commit is contained in:

Laurent Destailleur 2016-12-18 02:12:34 +01:00

parent 73e6663230 321933f267

commit 6830fdca98

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