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-05 12:52:40 +01:00

parent 356409bd72 97f0130861

commit 40c39fb8ad

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