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

..

console

Merge branch '3.8'

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

report

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

report.php

PHP CS fix

2014-05-30 15:22:00 +02:00