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

Browse Source

Conflicts:
	htdocs/holiday/card.php

...

This commit is contained in:

Laurent Destailleur 2019-03-09 00:01:29 +01:00

parent 233bd4374a 22bb62d900

commit 520387c03d

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