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

into develop Conflicts: htdocs/contact/class/contact.class.php test/phpunit/ContactTest.php test/phpunit/SocieteTest.php
2011-12-30 14:22:17 +01:00 · 2011-12-30 14:22:17 +01:00 · e97078f6c1
commit e97078f6c1
parent 55156edd0d 4bf03a2d0e
2 changed files with 2 additions and 2 deletions
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@ -280,4 +280,4 @@ class ContactTest extends PHPUnit_Framework_TestCase
        return;
    }
 }
-?>
+?>
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@ -321,4 +321,4 @@ class SocieteTest extends PHPUnit_Framework_TestCase
        return;
    }
 }
-?>
+?>