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

into develop Conflicts: test/phpunit/PricesTest.php
2012-01-12 09:35:46 +01:00 · 2012-01-12 09:35:46 +01:00 · d45a473d22
commit d45a473d22
parent d79c9dd17e 84d1ef2a8f
1 changed files with 1 additions and 1 deletions
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@ -196,4 +196,4 @@ class PricesTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>