Nicolas Le Goff 46da7be65d Merge branch '3.8' ...

Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php

2014-08-19 15:30:25 +02:00

..

Admin

Fix CS

2014-07-17 15:17:04 +02:00

Api

Fix latest merge

2014-08-19 14:59:48 +02:00

Client

Use user manipulator to log user query

2014-03-04 19:53:07 +01:00

Prod

Fix latest merge

2014-08-13 17:40:40 +02:00

Report

Merge branch '3.8'

2014-03-30 09:00:17 +02:00

Root

Merge branch '3.8'

2014-08-19 12:17:18 +02:00

User

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

MinifierTest.php

Fix unit test names, property and function visibility

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

RecordsRequestTest.php

Fix CS

2014-02-19 17:29:26 +01:00

SetupTest.php

Merge branch '3.8'

2014-08-19 15:30:25 +02:00