Commit Graph

2 Commits

Author SHA1 Message Date
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