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

Browse Source

Conflicts:
	htdocs/comm/propal.php

...

This commit is contained in:

Regis Houssin 2012-01-13 17:48:02 +01:00

parent 9fe45c4f4f 7363b39c17

commit d5131b0e16

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