Merge branch 'develop' of git+ssh://github.com/Dolibarr/dolibarr into develop

Browse Source

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

...

This commit is contained in:

Regis Houssin

2011-11-20 16:56:44 +01:00

parent c206f4ae60 4bf1585d0f

commit afbd43c3ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available