Merge remote-tracking branch 'origin/3.7' into 3.8

a462cd23 · Laurent Destailleur · 9e2a0562 · 4a88c9ea · a462cd23 · a462cd23
Commit a462cd23 authored 9 years ago by Laurent Destailleur
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
--- a/test/phpunit/Example_import_company_1.csv
+++ b/test/phpunit/Example_import_company_1.csv
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php