Nicolas Le Goff 6053a03b87 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php

2014-02-11 09:02:29 +01:00

..

ApiJSONPTest.php

Fix CS

2014-01-14 12:04:38 +01:00

ApiJsonTest.php

Fix CS

2014-01-14 12:04:38 +01:00

ApiRootTest.php

Add improvements to unit tests

2013-12-20 10:51:35 +01:00

ApiTestCase.php

Merge branch '3.8'

2014-02-11 09:02:29 +01:00

ApiYamlTest.php

Fix CS

2014-01-14 12:04:38 +01:00

ConsoleAPITest.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

LightboxTest.php

Add improvements to unit tests

2013-12-20 10:51:35 +01:00

OAuth2Test.php

Fix CS

2014-01-14 12:04:38 +01:00

OverviewTest.php

Merge branch '3.8'

2014-02-04 17:25:40 +01:00

RootApplicationTest.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00