Nicolas Le Goff fc2f49d012 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php

2014-09-02 19:09:38 +02:00

..

Less

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

String

Bump copyright year

2014-01-06 15:28:12 +01:00

CachedTranslator.php

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

ComposerSetup.php

Bump copyright year

2014-01-06 15:40:56 +01:00

CrossDomainDumper.php

Add crossdomain file generator command

2014-08-19 16:35:57 +02:00

CrossDomainParser.php

Fix minor issues

2014-08-29 18:07:48 +02:00

RedisSessionHandler.php

Merge branch '3.8'

2014-01-27 17:23:03 +01:00