Romain Neutron f27fa53d4c Merge branch '3.8' ...

Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php

2013-11-05 15:20:35 +01:00

..

index.html.twig

Addressed github review

2013-05-13 15:35:56 +02:00

step2.html.twig

Revert tests in html setup

2013-05-23 16:14:53 +02:00

upgrade-instructions.html.twig

Remove infinite redirection, add upgrade instructions

2013-09-17 16:28:23 +02:00

wrapper.html.twig

Merge branch '3.8'

2013-11-05 15:20:35 +01:00