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

Browse Source

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

...

This commit is contained in:

Regis Houssin 2011-11-20 16:37:27 +01:00

parent 3c7c220bad 065d7996f5

commit 4bf1585d0f

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