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

Browse Source

into develop

Conflicts:
	htdocs/contact/class/contact.class.php
	test/phpunit/ContactTest.php
	test/phpunit/SocieteTest.php

...

This commit is contained in:

Laurent Destailleur 2011-12-30 14:22:17 +01:00

parent 55156edd0d 4bf03a2d0e

commit e97078f6c1

2 changed files with 2 additions and 2 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