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

..

Alchemy/Phrasea

Merge branch '3.8'

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

classes

Merge branch '3.8'

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

conf.d

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

Fixtures

Rename files

2012-09-19 15:39:29 +02:00

autoload.php

Update autoloader path

2013-05-31 11:40:52 +02:00