Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source

Conflicts:
	dev/setup/codesniffer/ruleset.xml

...

This commit is contained in:

Laurent Destailleur 2018-11-09 01:32:47 +01:00

parent 9d15f83f4c 9bced281db

commit 4946de9533

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