Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
This commit is contained in:
Laurent Destailleur
2014-05-18 11:57:18 +02:00
parent ab337c7485 7216b2a843
commit 0e13ded641
15 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/ExportTest.php
View File

@@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
return true;
}
}
?>
?>