Merge remote-tracking branch 'origin/3.5' into develop

Conflicts: test/phpunit/DateLibTzFranceTest.php test/phpunit/ModulesTest.php
2014-05-18 11:59:51 +02:00 · 2014-05-18 11:59:51 +02:00 · 01e3e13865
commit 01e3e13865
parent b7f55ea99c 0e13ded641
9 changed files with 9 additions and 9 deletions
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@ -336,4 +336,4 @@ class CategorieTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@ -233,4 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@ -297,4 +297,4 @@ class CoreTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals($result,$expectedresult);
    }
 }
-?>
+?>
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
        return true;
    }
 }
-?>
+?>
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@ -329,4 +329,4 @@ class FactureTest extends PHPUnit_Framework_TestCase
        return $retAr;
    }
 }
-?>
+?>
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@ -333,4 +333,4 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@ -134,4 +134,4 @@ class ImportTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@ -170,4 +170,4 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@ -265,4 +265,4 @@ class PropalTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>