Commit Graph

6 Commits

Author SHA1 Message Date
Laurent Destailleur
0e13ded641 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
2014-05-18 11:57:18 +02:00
Laurent Destailleur
7216b2a843 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:27 +02:00
Laurent Destailleur
876a35d1a1 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:19 +02:00
Laurent Destailleur
c92d0fe966 Fix: phpunit 2013-11-19 23:06:25 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
060edf21da New: Add more PHPUnit tests to prepare removal of adodb. 2013-01-18 15:54:40 +01:00