SocieteTest.php

13 years ago
e97078f6
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git · e97078f6
Laurent Destailleur authored 13 years ago
```
into develop

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

History
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
Laurent Destailleur authored 13 years ago
```
into develop

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