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

Browse Source

Conflicts:
	htdocs/holiday/define_holiday.php

...

This commit is contained in:

Laurent Destailleur 2019-01-08 01:46:03 +01:00

parent 3d578cab28 66b2a82be6

commit 8e3df45cbf

1 changed files with 1 additions and 1 deletions

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