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

Browse Source

Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/security2.lib.php

...

This commit is contained in:

Laurent Destailleur 2019-01-19 13:19:58 +01:00

parent aaa61254ac c1c3eb61f8

commit 1ac55b0800

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