Merge branch '3.7'

This commit is contained in:
Romain Neutron
2013-03-28 14:37:57 +01:00
26 changed files with 585 additions and 192 deletions

View File

@@ -13,6 +13,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
public function setUp()
{
parent::setUp();
self::$DI['app']->register(new \API_V1_Timer());
$this->object = new API_V1_adapter(self::$DI['app']);
}