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

Browse Source

Conflicts:
	test/phpunit/hudson_phpunittest.xml

...

This commit is contained in:

Regis Houssin 2011-09-29 11:23:13 +02:00

parent 39951571ea 1aac0ffddb

commit f579f5bf4b

1 changed files with 1 additions and 1 deletions

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