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

Browse Source

Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php

...

This commit is contained in:

Laurent Destailleur 2017-11-24 16:51:59 +01:00

parent 1e4844fd1c 356f36c5bf

commit 2493c2468d

1 changed files with 2 additions and 2 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