Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source

Conflicts:
	htdocs/core/lib/company.lib.php

...

This commit is contained in:

Laurent Destailleur 2015-11-02 19:19:05 +01:00

parent 64ff12c009 c06c2d0464

commit 38ed83d05f

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